v6.8.4

Make data prop required, but allow it to be anything.
v6.8.3
2026-08-19 08:20:30 +00:00 · 2018-05-18 17:34:41 -06:00 · 2018-05-18 17:34:03 -06:00 · 2018-05-18 17:32:04 -06:00 · 2018-04-19 18:48:52 -06:00 · 2018-04-17 15:14:45 -06:00
61 changed files with 22570 additions and 5806 deletions
@@ -0,0 +1,3 @@
+module.exports = {
+  extends: 'react-tools',
+}
@@ -1,8 +1,10 @@
 node_modules/
 lib/
+es/
+docs/build
 react-table.js
+react-table.min.js
 react-table.css
 *.log
-example/dist/
-
-storybook-static
+.idea
+.DS_Store
@@ -1,40 +0,0 @@
-import React from 'react'
-import { configure, storiesOf } from '@kadira/storybook'
-
-import './reset.css'
-import './fonts.css'
-import './layout.css'
-import '../stories/utils/prism.css'
-import 'github-markdown-css/github-markdown.css'
-import '../react-table.css'
-//
-import Readme from '../README.md'
-//
-import Simple from '../stories/Simple.js'
-import ServerSide from '../stories/ServerSide.js'
-import SubComponents from '../stories/SubComponents.js'
-import Pivoting from '../stories/Pivoting.js'
-import PivotingSubComponents from '../stories/PivotingSubComponents.js'
-import MillionRows from '../stories/MillionRows.js'
-//
-configure(() => {
-  storiesOf('1. Docs')
-    .add('Readme', () => {
-      const ReadmeCmp = React.createClass({
-        render () {
-          return <span className='markdown-body' dangerouslySetInnerHTML={{__html: Readme}} />
-        },
-        componentDidMount () {
-          global.Prism.highlightAll()
-        }
-      })
-      return <ReadmeCmp />
-    })
-  storiesOf('2. Demos')
-    .add('Client-side Data', Simple)
-    .add('Server-side Data', ServerSide)
-    .add('Sub Components', SubComponents)
-    .add('Pivoting & Aggregation', Pivoting)
-    .add('Pivoting & Aggregation w/ Sub Components', PivotingSubComponents)
-    .add('1 Million Rows w/ Pivoting & Sub Components', MillionRows)
-}, module)
@@ -1,6 +0,0 @@
-@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,600");
-body {
-  background: #fff;
-  font-family: 'Open Sans', sans-serif;
-  font-weight: 300;
-}
@@ -1,3 +0,0 @@
-body{
-	padding: 20px;
-}
@@ -1,48 +0,0 @@
-/* http://meyerweb.com/eric/tools/css/reset/
-   v2.0 | 20110126
-   License: none (public domain)
-*/
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	font-size: 100%;
-	font: inherit;
-	vertical-align: baseline;
-}
-/* HTML5 display-role reset for older browsers */
-article, aside, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section {
-	display: block;
-}
-body {
-	line-height: 1;
-}
-/*ol, ul {
-	list-style: none;
-}*/
-blockquote, q {
-	quotes: none;
-}
-blockquote:before, blockquote:after,
-q:before, q:after {
-	content: '';
-	content: none;
-}
-table {
-	border-collapse: collapse;
-	border-spacing: 0;
-}
@@ -1,27 +0,0 @@
-const path = require('path')
-
-// load the default config generator.
-const genDefaultConfig = require('@kadira/storybook/dist/server/config/defaults/webpack.config.js')
-
-module.exports = (config, env) => {
-  config = genDefaultConfig(config, env)
-
-  Object.assign(config, {
-    module: Object.assign(config.module, {
-      loaders: config.module.loaders.concat([{
-        test: /\.md$/,
-        loader: 'html!markdown',
-        include: path.resolve(__dirname, '../')
-      }, {
-        test: /\.html$/,
-        loader: 'html',
-        query: {
-          minimize: true
-        },
-        include: path.resolve(__dirname, '../')
-      }])
-    })
-  })
-
-  return config
-}
@@ -0,0 +1,161 @@
+## 6.8.3
+
+#### Fixes & Optimizations
+
+* Allow the `resolveData` prop to alter or materialize new data when the `data` prop changes.
+
+## 6.8.1
+
+#### Fixes & Optimizations
+
+* Updated eslint and code formatting
+
+## 6.7.5
+
+#### Fixes & Optimizations
+
+* Now passes `column` to `getResizerProps` (#667)
+* NOTE: `getResizerProps` is now only called if the column is resizable
+* Fixes the `className` ordering in defaultProps for ThComponent (#673)
+* NOTE: user supplied classNames now come at the end so they can extend the defaults
+
+## 6.7.4
+
+#### Fixes & Optimizations
+
+* Fix Prop types for columns
+
+## 6.7.3
+
+#### Fixes & Optimizations
+
+* Fix the rest of the proptypes
+
+## 6.7.2
+
+#### Fixes & Optimizations
+
+* `getPropTypes` proptype check
+
+## 6.7.1
+
+#### Fixes & Optimizations
+
+* `eslint-config` moved to dev deps
+
+## 6.7.0
+
+## 6.7.0-alpha-0
+
+#### New Features
+
+* Expose page/pageSize to rows/cells
+* Supply sort direction to custom sort methods
+
+#### Fixes & Optimizations
+
+* README updates
+* Linter cleanup
+* Added PropTypes node module
+* Deps, linting and style upgrades
+
+## 6.6.0
+
+#### Fixes & Optimizations
+
+* moved repo to react-tools
+* Doc examples moved to codesandbox.io
+* README updates
+* CSS refacting for rt-tfoot to match rt-thead
+* CSS more specific for input and select
+
+## 6.5.3
+
+#### Fixes & Optimizations
+
+* `onClick` proxying and eslint
+
+## 6.5.2
+
+#### New Features
+
+* Provide onClick handleOriginal function - #406
+
+#### Fixes & Optimizations
+
+* README updates
+* `makePathArray` in utils - #326
+* Various fixes: #294, #376, #398, #415,
+
+## 6.5.1
+
+#### Fixes & Optimizations
+
+* `defaultExpanded` now works correctly - #372
+* `column.getProps().rest` props are now applied correctly
+* `makeTemplateComponent` now supports `displayName` - #289
+
+## 6.5.0
+
+##### New Features
+
+* `column.filterAll` - defaults to `false`, but when set to `true` will provide the entire array of rows to `filterMethod` as opposed to one row at a time. This allows for more fine-grained filtering using any method you can dream up. See the [Custom Filtering example](https://react-table.js.org/#/story/custom-filtering) for more info.
+
+## 6.4.0
+
+##### New Features
+
+* `PadRowComponent` - the content rendered inside of a padding row. Defaults to a react component that renders `&nbsp;`
+
+## 6.3.0
+
+##### New Features
+
+* `defaultSortDesc` - allows you to set the default sorting direction for all columns to descending.
+* `column.defaultSortDesc` - allows you to set the default sorting direction for a specific column. Falls back to the global `defaultSortDesc` when not set at all.
+
+## 6.0.0
+
+##### New Features
+
+* New Renderers:
+  * `Aggregated` - Custom renderer for aggregated cells
+  * `Pivot` - Custom renderer for Pivoted Cells (utilizes `Expander` and `PivotValue`)
+  * `PivotValue` - Custom renderer for Pivot cell values (deprecates the undocumented `pivotRender` option)
+  * `Expander` - Custom renderer for Pivot cell Expander
+* Added custom sorting methods per table via `defaultSortMethod` and per column via `column.sortMethod`
+* Pivot columns are now visibly separate and sorted/filtered independently.
+* Added `column.resizable` to override global table `resizable` option for specific columns.
+* Added `column.sortable` to override global table `sortable` option for specific columns.
+* Added `column.filterable` to override global table `filterable` option for specific columns.
+* Added `defaultExpanded` table option.
+* All callbacks can now be utilized without needing to hoist and manage the piece of state they export. That is what their prop counterparts are for, so now the corresponding prop is used instead of the callback to detect a "fully controlled" state.
+* Prevent transitions while column resizing for a smoother resize effect.
+* Disable text selection while resizing columns.
+
+##### Breaking API Changes
+
+* New Renderers:
+  * `Cell` - deprecates and replaces `render`
+  * `Header` - deprecates and replaces `header`
+  * `Footer` - deprecates and replaces `footer`
+  * `Filter`- deprecates and replaces `filterRender`
+* Callbacks now provide the destination state as the primary parameter(s). This makes hoisting and controlling the state in redux or component state much easier. eg.
+  * `onSorting` no longer requires you to build your own toggle logic
+  * `onResize` no longer requires you to build your own resize logic
+* Renamed `onChange` callback -> `onFetchData` which will always fire when a new data model needs to be fetched (or if not using `manual`, when new data is materialized internally).
+* Renamed `filtering` -> `filtered`
+* Renamed `sorting` -> `sorted`
+* Renamed `expandedRows` -> `expanded`
+* Renamed `resizing` -> `resized`
+* Renamed `defaultResizing` -> `defaultResized`
+* Renamed `defaultFiltering` -> `defaultFiltered`
+* Renamed `defaultSorting` -> `defaultSorted`
+* Renamed `onSortingChange` -> `onSortedChange`
+* Renamed `onFilteringChange` -> `onFilteredChange`
+* Renamed `onResize` -> `onResizedChange`
+* Renamed `onExpandRow` -> `onExpandedChange`
+* Renamed `showFilters` -> `filterable`
+* Renamed `hideFilter` -> `filterable` (Column option. Note the true/false value is now flipped.)
+* `cellInfo.row` and `rowInfo.row` now reference the materialize data for the table. To reference the original row, use `cellInfo.original` and `rowInfo.original`
+* Removed `pivotRender` column option. You can now control how the value is displayed by overriding the `PivotValueComponent` or the individual column's `PivotValue` renderer. See [Pivoting Options Story](https://react-table.js.org/?selectedKind=2.%20Demos&selectedStory=Pivoting%20Options&full=0&down=1&left=1&panelRight=0&downPanel=kadirahq%2Fstorybook-addon-actions%2Factions-panel) for a reference on how to customize pivot column rendering.
@@ -0,0 +1,18 @@
+## What version of React-Table are you using?
+
+Your bug may already be fixed in the latest release. Run `yarn upgrade react-table`!
+Place your version here...
+
+## What bug are you experiencing, or what feature are you proposing?
+
+Please include a detailed explanation here...
+
+## Use https://codesandbox.io/s/X6npLXPRW (by clicking the "Fork" button) to reproduce the issue.
+
+Then paste a link to your newly forked codesandbox here...
+
+## What are the steps to reproduce the issue?
+
+1.  list the steps
+2.  to reproduce
+3.  the issue
@@ -0,0 +1,77 @@
+module.exports = {
+  parserOptions: {
+    ecmaVersion: 8,
+    ecmaFeatures: {
+      experimentalObjectRestSpread: true,
+      jsx: true,
+      node: false,
+      classes: true
+    },
+    sourceType: 'module'
+  },
+
+  parser: 'babel-eslint',
+
+  extends: ['standard'],
+
+  plugins: ['react'],
+
+  rules: {
+    // Nozzle
+    'jsx-quotes': [2, 'prefer-single'],
+    'comma-dangle': [2, 'always-multiline'],
+
+    // // React
+    'react/jsx-boolean-value': 2,
+    'react/jsx-curly-spacing': [2, 'never'],
+    'react/jsx-equals-spacing': [2, 'never'],
+    // 'react/jsx-indent': 2,
+    'react/jsx-indent-props': [2, 2],
+    'react/jsx-no-duplicate-props': 2,
+    'react/jsx-no-undef': 2,
+    'react/jsx-tag-spacing': [
+      2,
+      {
+        closingSlash: 'never',
+        beforeSelfClosing: 'always',
+        afterOpening: 'never'
+      }
+    ],
+    'react/jsx-uses-react': 2,
+    'react/jsx-uses-vars': 2,
+    'react/self-closing-comp': 2,
+    'react/jsx-no-bind': [
+      2,
+      {
+        allowArrowFunctions: true,
+        allowBind: false,
+        ignoreRefs: true
+      }
+    ],
+    'react/no-did-update-set-state': 2,
+    'react/no-unknown-property': 2,
+    'react/react-in-jsx-scope': 2,
+    'react/jsx-closing-bracket-location': [0, 'tag-aligned'],
+    'react/jsx-tag-spacing': [2, { beforeSelfClosing: 'always' }],
+    'react/jsx-wrap-multilines': 2,
+    'react/self-closing-comp': 2,
+    'react/jsx-key': 2,
+    'react/jsx-no-comment-textnodes': 2,
+    'react/jsx-no-duplicate-props': 2,
+    'react/jsx-no-target-blank': 2,
+    'react/jsx-no-undef': 2,
+    'react/jsx-uses-react': 2,
+    'react/jsx-uses-vars': 2,
+    'react/no-danger-with-children': 2,
+    'react/no-deprecated': 2,
+    'react/no-direct-mutation-state': 2,
+    'react/no-find-dom-node': 2,
+    'react/no-is-mounted': 2,
+    'react/no-render-return-value': 2,
+    'react/no-string-refs': 2,
+    'react/no-unknown-property': 2,
+    'react/react-in-jsx-scope': 2,
+    'react/require-render-return': 2
+    // 'react/jsx-max-props-per-line': [2, { maximum: 1 }]
+  }
+}
@@ -0,0 +1 @@
+react-table.js.org
@@ -0,0 +1,53 @@
+{
+  "name": "new",
+  "version": "0.1.0",
+  "private": true,
+  "devDependencies": {
+    "autoprefixer": "^6.7.0",
+    "babel-cli": "6.14.0",
+    "babel-eslint": "6.1.2",
+    "babel-preset-es2015": "6.14.0",
+    "babel-preset-react": "6.11.1",
+    "babel-preset-stage-2": "6.13.0",
+    "eslint": "^4.1.1",
+    "eslint-config-standard": "^10.2.1",
+    "eslint-plugin-class-property": "^1.0.6",
+    "eslint-plugin-import": "^2.8.0",
+    "eslint-plugin-jsx-a11y": "^6.0.2",
+    "eslint-plugin-node": "^5.2.1",
+    "eslint-plugin-promise": "^3.6.0",
+    "eslint-plugin-react": "^7.4.0",
+    "eslint-plugin-standard": "^3.0.1",
+    "html-element-attributes": "^1.3.0",
+    "match-sorter": "^1.8.0",
+    "npm-run-all": "^3.1.1",
+    "onchange": "^3.0.2",
+    "postcss-cli": "^2.6.0",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2",
+    "react-json-tree": "^0.10.9",
+    "rimraf": "^2.6.1",
+    "standard": "^10.0.2",
+    "stylus": "^0.54.5"
+  },
+  "dependencies": {
+    "eslint-config-react-tools": "^1.0.10",
+    "github-markdown-css": "^2.6.0",
+    "marked": "^0.3.6",
+    "namor": "^1.0.1",
+    "raw-loader": "^0.5.1",
+    "react": "^15.5.4",
+    "react-dom": "^15.5.4",
+    "react-json-tree": "^0.10.9",
+    "react-script": "^2.0.5",
+    "react-scripts": "^0.9.5",
+    "react-story": "^0.0.10",
+    "shortid": "^2.2.8"
+  },
+  "scripts": {
+    "start": "react-scripts start",
+    "build": "react-scripts build",
+    "test": "react-scripts test --env=jsdom",
+    "eject": "react-scripts eject"
+  }
+}
@@ -0,0 +1,31 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
+    <!--
+      Notice the use of %PUBLIC_URL% in the tag above.
+      It will be replaced with the URL of the `public` folder during the build.
+      Only files inside the `public` folder can be referenced from the HTML.
+
+      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
+      work correctly both with client-side routing and a non-root public URL.
+      Learn how to configure a non-root public URL by running `npm run build`.
+    -->
+    <title>React Table - A lightweight, fast and extendable datagrid built for React</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <!--
+      This HTML file is a template.
+      If you open it directly in the browser, you will see an empty page.
+
+      You can add webfonts, meta tags, or analytics to this file.
+      The build step will place the bundled scripts into the <body> tag.
+
+      To begin the development, run `npm start`.
+      To create a production bundle, use `npm run build`.
+    -->
+  </body>
+</html>
@@ -0,0 +1,117 @@
+/* eslint-disable */
+
+import React from "react";
+//
+import ReactStory, { defaultProps } from "react-story";
+import CodeSandbox from "./CodeSandbox.js";
+import "./stories/utils/prism.css";
+import "../../react-table.css";
+
+import Readme from "./stories/Readme.js";
+import HOCReadme from "./stories/HOCReadme.js";
+
+// import Test from './stories/test.js'
+
+// import Tester from './examples/expander';
+
+const stories = [
+  { name: "Readme", component: Readme },
+  { name: "HOC Readme", component: HOCReadme },
+
+  // { name: 'Tester', component: Test },
+  { name: "Simple Table", component: CodeSandbox("X6npLXPRW") },
+  {
+    name: "Cell Renderers & Custom Components",
+    component: CodeSandbox("OyRL04Z4Y")
+  },
+  { name: "Default Sorting", component: CodeSandbox("gLwmmjzA3") },
+  {
+    name: "Custom Sorting",
+    component: CodeSandbox("VGx67J35")
+  },
+  { name: "Custom Column Widths", component: CodeSandbox("o2OORXNXN") },
+  { name: "Custom Component Props", component: CodeSandbox("nZW3L0wp4") },
+  { name: "Server-side Data", component: CodeSandbox("wjrn8wy3R") },
+  { name: "Sub Components", component: CodeSandbox("n2gqAxl7") },
+  { name: "Pivoting & Aggregation", component: CodeSandbox("oNY9z8xN") },
+  {
+    name: "Pivoting & Aggregation w/ Sub Components",
+    component: CodeSandbox("p0kEVBgQ")
+  },
+  {
+    name: "100k Rows w/ Pivoting & Sub Components",
+    component: CodeSandbox("DRmKj0XyK")
+  },
+  { name: "Pivoting Options", component: CodeSandbox("kZKmNBK6r") },
+  { name: "Functional Rendering", component: CodeSandbox("VPZ0Bzv8X") },
+  {
+    name: "Custom Expander Position",
+    component: CodeSandbox("1jj2XrPEV")
+  },
+  { name: 'Custom "No Data" Text', component: CodeSandbox("RgRpRDv80") },
+  { name: "Footers", component: CodeSandbox("KOqQXn3p8") },
+  { name: "Custom Filtering", component: CodeSandbox("5Eyxxxyx") },
+  { name: "Controlled Component", component: CodeSandbox("r7XEZRK2") },
+  { name: "Editable Table", component: CodeSandbox("n5r19gzQP") },
+  {
+    name: "Fixed Header w/ Vertical Scroll",
+    component: CodeSandbox("7LY0gjA8O")
+  },
+  {
+    name: "Multiple Pagers (Top and Bottom)",
+    component: CodeSandbox("VEZ8OgvX")
+  },
+  { name: "Tree Table (HOC)", component: CodeSandbox("lxmr4wynzq") },
+  { name: "Select Table (HOC)", component: CodeSandbox("7yq5ylw09j") },
+  { name: "Select Tree Table (HOC)", component: CodeSandbox("2p7jp4klwp") }
+];
+
+export default class App extends React.Component {
+  render() {
+    return (
+      <ReactStory
+        style={{
+          display: "block",
+          width: "100%",
+          height: "100%"
+        }}
+        pathPrefix="story/"
+        StoryWrapper={props => (
+          <defaultProps.StoryWrapper
+            css={{
+              padding: 0,
+              display: "flex",
+              flexDirection: "column"
+            }}
+          >
+            <a
+              href="//github.com/react-tools/react-table"
+              style={{
+                display: "block",
+                textAlign: "center",
+                borderBottom: "solid 3px #cccccc"
+              }}
+            >
+              <img
+                src="https://github.com/react-tools/media/raw/master/logo-react-table.png"
+                alt="React Table Logo"
+                style={{
+                  width: "150px",
+                  padding: "10px"
+                }}
+              />
+            </a>
+            <div
+              {...props}
+              style={{
+                flex: "1 0 auto",
+                position: "relative"
+              }}
+            />
+          </defaultProps.StoryWrapper>
+        )}
+        stories={stories}
+      />
+    );
+  }
+}
@@ -0,0 +1,21 @@
+import React from "react";
+
+export default id => () => {
+  return (
+    <iframe
+      src={`https://codesandbox.io/embed/${id}?autoresize=1&hidenavigation=1&view=${
+        global.innerWidth < 1000 ? "preview" : "split"
+      }`}
+      style={{
+        position: "absolute",
+        top: 0,
+        left: 0,
+        width: `100%`,
+        height: `100%`,
+        border: 0,
+        overflow: `hidden`
+      }}
+      sandbox="allow-modals allow-forms allow-popups allow-scripts allow-same-origin"
+    />
+  );
+};
@@ -0,0 +1,94 @@
+import React from "react";
+
+export default Component => {
+  const wrapper = class RTCheckboxTable extends React.Component {
+    // we only need a Component so we can get the 'ref' - pure components can't get a 'ref'
+
+    rowSelector = row => {
+      if (!row || !row.hasOwnProperty(this.props.keyField)) return null;
+      const checked = this.props.isSelected(row[this.props.keyField]);
+      return (
+        <input
+          type="checkbox"
+          checked={checked}
+          onClick={e => {
+            const { shiftKey } = e;
+            e.stopPropagation();
+            this.props.toggleSelection(row[this.props.keyField], shiftKey, row);
+          }}
+          onChange={() => {}}
+          value=""
+        />
+      );
+    };
+
+    headSelector = row => {
+      const checked = this.props.selectAll;
+      return (
+        <input
+          type="checkbox"
+          checked={checked}
+          onClick={e => {
+            e.stopPropagation();
+            this.props.toggleAll();
+          }}
+          onChange={() => {}}
+          value=""
+        />
+      );
+    };
+
+    // this is so we can expose the underlying ReactTable to get at the sortedData for selectAll
+    getWrappedInstance = () => this.wrappedInstance;
+
+    render() {
+      const {
+        columns: originalCols,
+        isSelected,
+        toggleSelection,
+        toggleAll,
+        keyField,
+        selectAll,
+        ...rest
+      } = this.props;
+      const { rowSelector, headSelector } = this;
+      const select = {
+        id: "_selector",
+        accessor: () => "x", // this value is not important
+        Header: headSelector,
+        Cell: ci => {
+          return rowSelector(ci.original);
+        },
+        width: 30,
+        filterable: false,
+        sortable: false,
+        resizable: false,
+        style: { textAlign: "center" }
+      };
+      const columns = [select, ...originalCols];
+      const extra = {
+        columns
+      };
+      return (
+        <Component {...rest} {...extra} ref={r => (this.wrappedInstance = r)} />
+      );
+    }
+  };
+
+  wrapper.displayName = "RTCheckboxTable";
+  wrapper.defaultProps = {
+    keyField: "_id",
+    isSelected: key => {
+      console.log("No isSelected handler provided:", { key });
+    },
+    selectAll: false,
+    toggleSelection: (key, shift, row) => {
+      console.log("No toggleSelection handler provided:", { key, shift, row });
+    },
+    toggleAll: () => {
+      console.log("No toggleAll handler provided.");
+    }
+  };
+
+  return wrapper;
+};
@@ -0,0 +1,148 @@
+import React from "react";
+import shortid from "shortid";
+
+import ReactTable from "../../../../lib/index";
+import "../../../../react-table.css";
+
+import checkboxTableHOC from "./checkboxHOC";
+
+const CheckboxTable = checkboxTableHOC(ReactTable);
+
+async function getData() {
+  const result = await (await fetch("/au_500_tree.json")).json();
+  // we are adding a unique ID to the data for tracking the selected records
+  return result.map(item => {
+    const _id = shortid.generate();
+    return {
+      _id,
+      ...item
+    };
+  });
+}
+
+function getColumns(data) {
+  const columns = [];
+  const sample = data[0];
+  for (let key in sample) {
+    if (key === "_id") continue;
+    columns.push({
+      accessor: key,
+      Header: key
+    });
+  }
+  return columns;
+}
+
+export class ComponentTest extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      data: null,
+      columns: null,
+      selection: [],
+      selectAll: false
+    };
+  }
+  componentDidMount() {
+    getData().then(data => {
+      const columns = getColumns(data);
+      this.setState({ data, columns });
+    });
+  }
+  toggleSelection = (key, shift, row) => {
+    /*
+      Implementation of how to manage the selection state is up to the developer.
+      This implementation uses an array stored in the component state.
+      Other implementations could use object keys, a Javascript Set, or Redux... etc.
+    */
+    // start off with the existing state
+    let selection = [...this.state.selection];
+    const keyIndex = selection.indexOf(key);
+    // check to see if the key exists
+    if (keyIndex >= 0) {
+      // it does exist so we will remove it using destructing
+      selection = [
+        ...selection.slice(0, keyIndex),
+        ...selection.slice(keyIndex + 1)
+      ];
+    } else {
+      // it does not exist so add it
+      selection.push(key);
+    }
+    // update the state
+    this.setState({ selection });
+  };
+  toggleAll = () => {
+    /*
+      'toggleAll' is a tricky concept with any filterable table
+      do you just select ALL the records that are in your data?
+      OR
+      do you only select ALL the records that are in the current filtered data?
+      
+      The latter makes more sense because 'selection' is a visual thing for the user.
+      This is especially true if you are going to implement a set of external functions
+      that act on the selected information (you would not want to DELETE the wrong thing!).
+      
+      So, to that end, access to the internals of ReactTable are required to get what is
+      currently visible in the table (either on the current page or any other page).
+      
+      The HOC provides a method call 'getWrappedInstance' to get a ref to the wrapped
+      ReactTable and then get the internal state and the 'sortedData'. 
+      That can then be iterrated to get all the currently visible records and set
+      the selection state.
+    */
+    const selectAll = this.state.selectAll ? false : true;
+    const selection = [];
+    if (selectAll) {
+      // we need to get at the internals of ReactTable
+      const wrappedInstance = this.checkboxTable.getWrappedInstance();
+      // the 'sortedData' property contains the currently accessible records based on the filter and sort
+      const currentRecords = wrappedInstance.getResolvedState().sortedData;
+      // we just push all the IDs onto the selection array
+      currentRecords.forEach(item => {
+        selection.push(item._original._id);
+      });
+    }
+    this.setState({ selectAll, selection });
+  };
+  isSelected = key => {
+    /*
+      Instead of passing our external selection state we provide an 'isSelected'
+      callback and detect the selection state ourselves. This allows any implementation
+      for selection (either an array, object keys, or even a Javascript Set object).
+    */
+    return this.state.selection.includes(key);
+  };
+  logSelection = () => {
+    console.log("selection:", this.state.selection);
+  };
+  render() {
+    const { toggleSelection, toggleAll, isSelected, logSelection } = this;
+    const { data, columns, selectAll } = this.state;
+    const extraProps = {
+      selectAll,
+      isSelected,
+      toggleAll,
+      toggleSelection
+    };
+    return (
+      <div style={{ padding: "10px" }}>
+        <h1>react-table - Checkbox Table</h1>
+        <button onClick={logSelection}>Log Selection to Console</button>
+        {` (${this.state.selection.length}) selected`}
+        {data ? (
+          <CheckboxTable
+            data={data}
+            columns={columns}
+            ref={r => (this.checkboxTable = r)}
+            className="-striped -highlight"
+            {...extraProps}
+          />
+        ) : null}
+      </div>
+    );
+  }
+}
+
+// export default treeTableHOC(ComponentTest);
+export default ComponentTest;
@@ -0,0 +1,60 @@
+import React from "react";
+
+export default class ComponentTest extends React.component {
+  render() {
+    return <div>Bozo</div>;
+  }
+}
+
+// import ReactTable from '../../../../lib/index'
+// import '../../../../react-table.css'
+//
+// console.log('ReactTable:',ReactTable)
+//
+// const data = [
+//   {one:"1.1",two:"1.2"},
+//   {one:"2.1",two:"2.2"},
+//   {one:"3.1",two:"3.2"},
+//   {one:"4.1",two:"4.2"},
+// ]
+//
+// const columns = [
+//   {accessor:'one', Header: 'One'},
+//   {accessor:'two', Header: 'Two'},
+// ]
+//
+// class ExpanderComponent extends React.Component {
+//   render()
+//   {
+//     return (
+//       <div className={`rt-expander ${this.props.isExpanded ? '-open' : ''}`}>
+//         &bull;
+//       </div>
+//     )
+//   }
+// }
+//
+// class SubComponent extends React.Component {
+//   render()
+//   {
+//     return <div>Nothing</div>
+//   }
+// }
+//
+// export default class ComponentTest extends React.Component {
+//   render()
+//   {
+//     const rtProps = {
+//       data,
+//       columns,
+//       // ExpanderComponent: (props)=><ExpanderComponent {...props} />,
+//       // SubComponent: (props)=><SubComponent {...props} />,
+//       // multiSort: false,
+//     }
+//     return (
+//       <ReactTable
+//         {...rtProps}
+//       />
+//     )
+//   }
+// }
@@ -0,0 +1,7 @@
+/* eslint-disable */
+
+import TreeTable from "./treetable";
+import SelectTable from "./selecttable";
+import SelectTreeTable from "./selecttreetable";
+
+export { TreeTable, SelectTable, SelectTreeTable };
@@ -0,0 +1,173 @@
+import React from "react";
+import shortid from "shortid";
+
+import ReactTable from "../../../../lib/index";
+import "../../../../react-table.css";
+
+import selectTableHOC from "../../../../lib/hoc/selectTable";
+
+const SelectTable = selectTableHOC(ReactTable);
+
+async function getData() {
+  const result = await (await fetch("/au_500_tree.json")).json();
+  // we are adding a unique ID to the data for tracking the selected records
+  return result.map(item => {
+    const _id = shortid.generate();
+    return {
+      _id,
+      ...item
+    };
+  });
+}
+
+function getColumns(data) {
+  const columns = [];
+  const sample = data[0];
+  for (let key in sample) {
+    if (key === "_id") continue;
+    columns.push({
+      accessor: key,
+      Header: key
+    });
+  }
+  return columns;
+}
+
+export class ComponentTest extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      data: null,
+      columns: null,
+      selection: [],
+      selectAll: false,
+      selectType: "checkbox"
+    };
+  }
+  componentDidMount() {
+    getData().then(data => {
+      const columns = getColumns(data);
+      this.setState({ data, columns });
+    });
+  }
+  toggleSelection = (key, shift, row) => {
+    /*
+      Implementation of how to manage the selection state is up to the developer.
+      This implementation uses an array stored in the component state.
+      Other implementations could use object keys, a Javascript Set, or Redux... etc.
+    */
+    // start off with the existing state
+    if (this.state.selectType === "radio") {
+      let selection = [];
+      if (selection.indexOf(key) < 0) selection.push(key);
+      this.setState({ selection });
+    } else {
+      let selection = [...this.state.selection];
+      const keyIndex = selection.indexOf(key);
+      // check to see if the key exists
+      if (keyIndex >= 0) {
+        // it does exist so we will remove it using destructing
+        selection = [
+          ...selection.slice(0, keyIndex),
+          ...selection.slice(keyIndex + 1)
+        ];
+      } else {
+        // it does not exist so add it
+        selection.push(key);
+      }
+      // update the state
+      this.setState({ selection });
+    }
+  };
+  toggleAll = () => {
+    /*
+      'toggleAll' is a tricky concept with any filterable table
+      do you just select ALL the records that are in your data?
+      OR
+      do you only select ALL the records that are in the current filtered data?
+      
+      The latter makes more sense because 'selection' is a visual thing for the user.
+      This is especially true if you are going to implement a set of external functions
+      that act on the selected information (you would not want to DELETE the wrong thing!).
+      
+      So, to that end, access to the internals of ReactTable are required to get what is
+      currently visible in the table (either on the current page or any other page).
+      
+      The HOC provides a method call 'getWrappedInstance' to get a ref to the wrapped
+      ReactTable and then get the internal state and the 'sortedData'. 
+      That can then be iterrated to get all the currently visible records and set
+      the selection state.
+    */
+    const selectAll = this.state.selectAll ? false : true;
+    const selection = [];
+    if (selectAll) {
+      // we need to get at the internals of ReactTable
+      const wrappedInstance = this.selectTable.getWrappedInstance();
+      // the 'sortedData' property contains the currently accessible records based on the filter and sort
+      const currentRecords = wrappedInstance.getResolvedState().sortedData;
+      // we just push all the IDs onto the selection array
+      currentRecords.forEach(item => {
+        if (item._original) {
+          selection.push(item._original._id);
+        }
+      });
+    }
+    this.setState({ selectAll, selection });
+  };
+  isSelected = key => {
+    /*
+      Instead of passing our external selection state we provide an 'isSelected'
+      callback and detect the selection state ourselves. This allows any implementation
+      for selection (either an array, object keys, or even a Javascript Set object).
+    */
+    return this.state.selection.includes(key);
+  };
+  logSelection = () => {
+    console.log("selection:", this.state.selection);
+  };
+  toggleType = () => {
+    this.setState({
+      selectType: this.state.selectType === "radio" ? "checkbox" : "radio",
+      selection: [],
+      selectAll: false
+    });
+  };
+  render() {
+    const {
+      toggleSelection,
+      toggleAll,
+      isSelected,
+      logSelection,
+      toggleType
+    } = this;
+    const { data, columns, selectAll, selectType } = this.state;
+    const extraProps = {
+      selectAll,
+      isSelected,
+      toggleAll,
+      toggleSelection,
+      selectType
+    };
+    return (
+      <div style={{ padding: "10px" }}>
+        <h1>react-table - Select Table</h1>
+        <button onClick={toggleType}>
+          Select Type: <strong>{selectType}</strong>
+        </button>
+        <button onClick={logSelection}>Log Selection to Console</button>
+        {` (${this.state.selection.length}) selected`}
+        {data ? (
+          <SelectTable
+            data={data}
+            columns={columns}
+            ref={r => (this.selectTable = r)}
+            className="-striped -highlight"
+            {...extraProps}
+          />
+        ) : null}
+      </div>
+    );
+  }
+}
+
+export default ComponentTest;
@@ -0,0 +1,238 @@
+import React from "react";
+import shortid from "shortid";
+
+import ReactTable from "../../../../lib/index";
+import "../../../../react-table.css";
+
+import selectTableHOC from "../../../../lib/hoc/selectTable";
+import treeTableHOC from "../../../../lib/hoc/treeTable";
+
+const SelectTreeTable = selectTableHOC(treeTableHOC(ReactTable));
+
+async function getData() {
+  const result = await (await fetch("/au_500_tree.json")).json();
+  // we are adding a unique ID to the data for tracking the selected records
+  return result.map(item => {
+    const _id = shortid.generate();
+    return {
+      _id,
+      ...item
+    };
+  });
+}
+
+function getColumns(data) {
+  const columns = [];
+  const sample = data[0];
+  for (let key in sample) {
+    if (key === "_id") continue;
+    columns.push({
+      accessor: key,
+      Header: key
+    });
+  }
+  return columns;
+}
+
+function getNodes(data, node = []) {
+  data.forEach(item => {
+    if (item.hasOwnProperty("_subRows") && item._subRows) {
+      node = getNodes(item._subRows, node);
+    } else {
+      node.push(item._original);
+    }
+  });
+  return node;
+}
+
+export class ComponentTest extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      data: null,
+      columns: null,
+      selection: [],
+      selectAll: false,
+      selectType: "checkbox"
+    };
+  }
+  componentDidMount() {
+    getData().then(data => {
+      const columns = getColumns(data);
+      const pivotBy = ["state", "post"];
+      this.setState({ data, columns, pivotBy });
+    });
+  }
+  toggleSelection = (key, shift, row) => {
+    /*
+      Implementation of how to manage the selection state is up to the developer.
+      This implementation uses an array stored in the component state.
+      Other implementations could use object keys, a Javascript Set, or Redux... etc.
+    */
+    // start off with the existing state
+    if (this.state.selectType === "radio") {
+      let selection = [];
+      if (selection.indexOf(key) < 0) selection.push(key);
+      this.setState({ selection });
+    } else {
+      let selection = [...this.state.selection];
+      const keyIndex = selection.indexOf(key);
+      // check to see if the key exists
+      if (keyIndex >= 0) {
+        // it does exist so we will remove it using destructing
+        selection = [
+          ...selection.slice(0, keyIndex),
+          ...selection.slice(keyIndex + 1)
+        ];
+      } else {
+        // it does not exist so add it
+        selection.push(key);
+      }
+      // update the state
+      this.setState({ selection });
+    }
+  };
+  toggleAll = () => {
+    /*
+      'toggleAll' is a tricky concept with any filterable table
+      do you just select ALL the records that are in your data?
+      OR
+      do you only select ALL the records that are in the current filtered data?
+      
+      The latter makes more sense because 'selection' is a visual thing for the user.
+      This is especially true if you are going to implement a set of external functions
+      that act on the selected information (you would not want to DELETE the wrong thing!).
+      
+      So, to that end, access to the internals of ReactTable are required to get what is
+      currently visible in the table (either on the current page or any other page).
+      
+      The HOC provides a method call 'getWrappedInstance' to get a ref to the wrapped
+      ReactTable and then get the internal state and the 'sortedData'. 
+      That can then be iterrated to get all the currently visible records and set
+      the selection state.
+    */
+    const selectAll = this.state.selectAll ? false : true;
+    const selection = [];
+    if (selectAll) {
+      // we need to get at the internals of ReactTable
+      const wrappedInstance = this.selectTable.getWrappedInstance();
+      // the 'sortedData' property contains the currently accessible records based on the filter and sort
+      const currentRecords = wrappedInstance.getResolvedState().sortedData;
+      // we need to get all the 'real' (original) records out to get at their IDs
+      const nodes = getNodes(currentRecords);
+      // we just push all the IDs onto the selection array
+      nodes.forEach(item => {
+        selection.push(item._id);
+      });
+    }
+    this.setState({ selectAll, selection });
+  };
+  isSelected = key => {
+    /*
+      Instead of passing our external selection state we provide an 'isSelected'
+      callback and detect the selection state ourselves. This allows any implementation
+      for selection (either an array, object keys, or even a Javascript Set object).
+    */
+    return this.state.selection.includes(key);
+  };
+  logSelection = () => {
+    console.log("selection:", this.state.selection);
+  };
+  toggleType = () => {
+    this.setState({
+      selectType: this.state.selectType === "radio" ? "checkbox" : "radio",
+      selection: [],
+      selectAll: false
+    });
+  };
+  toggleTree = () => {
+    if (this.state.pivotBy.length) {
+      this.setState({ pivotBy: [], expanded: {} });
+    } else {
+      this.setState({ pivotBy: ["state", "post"], expanded: {} });
+    }
+  };
+  onExpandedChange = expanded => {
+    this.setState({ expanded });
+  };
+  render() {
+    const {
+      toggleSelection,
+      toggleAll,
+      isSelected,
+      logSelection,
+      toggleType,
+      toggleTree,
+      onExpandedChange
+    } = this;
+    const {
+      data,
+      columns,
+      selectAll,
+      selectType,
+      pivotBy,
+      expanded
+    } = this.state;
+    const extraProps = {
+      selectAll,
+      isSelected,
+      toggleAll,
+      toggleSelection,
+      selectType,
+      pivotBy,
+      expanded,
+      onExpandedChange,
+      pageSize: 5
+    };
+    return (
+      <div style={{ padding: "10px" }}>
+        <h1>react-table - Select Tree Table</h1>
+        <p>
+          This example combines two HOCs (the TreeTable and the SelectTable) to
+          make a composite component.
+        </p>
+        <p>We'll call it SelectTreeTable!</p>
+        <p>Here is what the buttons do:</p>
+        <ul>
+          <li>
+            <strong>Toggle Tree:</strong> enables or disabled the pivotBy on the
+            table.
+          </li>
+          <li>
+            <strong>Select Type:</strong> changes from 'checkbox' to 'radio' and
+            back again.
+          </li>
+          <li>
+            <strong>Log Selection to Console:</strong> open your console to see
+            what has been selected.
+          </li>
+        </ul>
+        <p>
+          <strong>NOTE:</strong> the selection is maintained when toggling the
+          tree on and off but is cleared when switching between select types
+          (radio, checkbox).
+        </p>
+        <button onClick={toggleTree}>
+          Toggle Tree [{pivotBy && pivotBy.length ? pivotBy.join(", ") : ""}]
+        </button>
+        <button onClick={toggleType}>
+          Select Type: <strong>{selectType}</strong>
+        </button>
+        <button onClick={logSelection}>Log Selection to Console</button>
+        {` (${this.state.selection.length}) selected`}
+        {data ? (
+          <SelectTreeTable
+            data={data}
+            columns={columns}
+            ref={r => (this.selectTable = r)}
+            className="-striped -highlight"
+            freezeWhenExpanded={true}
+            {...extraProps}
+          />
+        ) : null}
+      </div>
+    );
+  }
+}
+
+export default ComponentTest;
@@ -0,0 +1,70 @@
+import React from "react";
+
+import ReactTable from "../../../../lib/index";
+import "../../../../react-table.css";
+
+import treeTableHOC from "../../../../lib/hoc/treeTable";
+
+async function getData() {
+  const result = await (await fetch("/au_500_tree.json")).json();
+  return result;
+}
+
+function getColumns(data, pivotBy) {
+  const columns = [];
+  const sample = data[0];
+  for (let key in sample) {
+    columns.push({
+      accessor: key,
+      Header: key
+    });
+  }
+  return columns;
+}
+
+export class ComponentTest extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      data: null,
+      columns: null,
+      pivotBy: null // ["firstName", "lastName"],
+    };
+  }
+  componentDidMount() {
+    getData().then(data => {
+      // console.log('cwm data:',data);
+      const pivotBy = ["state", "post", "city"];
+      const columns = getColumns(data, pivotBy);
+      // console.log('cwm cols:',columns);
+      this.setState({ data, columns, pivotBy });
+    });
+  }
+  showState = () => {
+    console.log("state:", this.reactTable.getResolvedState());
+  };
+  render() {
+    const { data, columns, pivotBy } = this.state;
+    const extraProps = {
+      data,
+      columns,
+      pivotBy
+    };
+    const TreeTable = treeTableHOC(ReactTable);
+    return (
+      <div style={{ padding: "10px" }}>
+        <h1>react-table - Tree Table</h1>
+        {data ? (
+          <TreeTable
+            ref={r => (this.reactTable = r)}
+            className="-striped -highlight"
+            defaultPageSize={5}
+            {...extraProps}
+          />
+        ) : null}
+      </div>
+    );
+  }
+}
+
+export default ComponentTest;
@@ -0,0 +1,53 @@
+import React from "react";
+
+export default Component => {
+  const wrapper = componentProps => {
+    const TrComponent = props => {
+      const { ri, ...rest } = props;
+      if (ri && ri.groupedByPivot) {
+        const cell = props.children[ri.level];
+
+        cell.props.style.flex = "unset";
+        cell.props.style.width = "100%";
+        cell.props.style.maxWidth = "unset";
+        cell.props.style.paddingLeft = `${componentProps.treeTableIndent *
+          ri.level}px`;
+        cell.props.style.backgroundColor = "#DDD";
+        cell.props.style.borderBottom = "1px solid rgba(128,128,128,0.2)";
+
+        return <div {...rest}>{cell}</div>;
+      }
+      return <Component.defaultProps.TrComponent {...rest} />;
+    };
+
+    const getTrProps = (state, ri, ci, instance) => {
+      return { ri };
+    };
+
+    const { columns, ...rest } = componentProps;
+    const extra = {
+      columns: columns.map(col => {
+        let column = col;
+        if (rest.pivotBy && rest.pivotBy.includes(col.accessor)) {
+          column = {
+            accessor: col.accessor,
+            width: `${componentProps.treeTableIndent}px`,
+            show: false,
+            Header: ""
+          };
+        }
+        return column;
+      }),
+      TrComponent,
+      getTrProps
+    };
+
+    return <Component {...rest} {...extra} />;
+  };
+  wrapper.displayName = "RTTreeTable";
+  wrapper.defaultProps = {
+    treeTableRowBackground: "#EEE",
+    treeTableIndent: 10
+  };
+  return wrapper;
+};
@@ -0,0 +1,35 @@
+import namor from "namor";
+
+const range = len => {
+  const arr = [];
+  for (let i = 0; i < len; i++) {
+    arr.push(i);
+  }
+  return arr;
+};
+
+const newPerson = () => {
+  const statusChance = Math.random();
+  return {
+    firstName: namor.generate({ words: 1, numbers: 0 }),
+    lastName: namor.generate({ words: 1, numbers: 0 }),
+    age: Math.floor(Math.random() * 30),
+    visits: Math.floor(Math.random() * 100),
+    progress: Math.floor(Math.random() * 100),
+    status:
+      statusChance > 0.66
+        ? "relationship"
+        : statusChance > 0.33
+          ? "complicated"
+          : "single"
+  };
+};
+
+export function makeData(len = 5553) {
+  return range(len).map(d => {
+    return {
+      ...newPerson(),
+      children: range(10).map(newPerson)
+    };
+  });
+}
@@ -0,0 +1,10 @@
+html,
+body,
+#root {
+  height: 100%;
+}
+body {
+  margin: 0;
+  padding: 0;
+  font-family: sans-serif;
+}
@@ -0,0 +1,7 @@
+import React from "react";
+import ReactDOM from "react-dom";
+//
+import "./index.css";
+import App from "./App.js";
+
+ReactDOM.render(<App />, document.getElementById("root"));
@@ -0,0 +1,23 @@
+/* eslint-disable  */
+import React from "react";
+import marked from "marked";
+//
+import HOCReadme from "!raw!../../../src/hoc/README.md";
+import "github-markdown-css/github-markdown.css";
+import "./utils/prism.js";
+
+export default class HOCStory extends React.Component {
+  render() {
+    return (
+      <div style={{ padding: "10px" }}>
+        <span
+          className="markdown-body"
+          dangerouslySetInnerHTML={{ __html: marked(HOCReadme) }}
+        />
+      </div>
+    );
+  }
+  componentDidMount() {
+    global.Prism && global.Prism.highlightAll();
+  }
+}
@@ -0,0 +1,23 @@
+/* eslint-disable import/no-webpack-loader-syntax */
+import React from "react";
+import marked from "marked";
+//
+import Readme from "!raw!../../../README.md";
+import "github-markdown-css/github-markdown.css";
+import "./utils/prism.js";
+
+export default class Story extends React.Component {
+  render() {
+    return (
+      <div style={{ padding: "10px" }}>
+        <span
+          className="markdown-body"
+          dangerouslySetInnerHTML={{ __html: marked(Readme) }}
+        />
+      </div>
+    );
+  }
+  componentDidMount() {
+    global.Prism && global.Prism.highlightAll();
+  }
+}
@@ -0,0 +1,27 @@
+import React from "react";
+
+import ReactTable from "../../../lib/index";
+import "../../../react-table.css";
+
+const data = [
+  { one: "1.1", two: "1.2" },
+  { one: "2.1", two: "2.2" },
+  { one: "3.1", two: "3.2" },
+  { one: "4.1", two: "4.2" }
+];
+
+const columns = [
+  { accessor: "one", Header: "One" },
+  { accessor: "two", Header: "Two" }
+];
+
+export default class Story extends React.Component {
+  render() {
+    return (
+      <div>
+        Test
+        <ReactTable data={data} columns={columns} />
+      </div>
+    );
+  }
+}
@@ -1,12 +1,12 @@
 {
  "name": "react-table",
-  "version": "4.2.1",
+  "version": "6.8.4",
  "description": "A fast, lightweight, opinionated table and datagrid built on React",
  "license": "MIT",
-  "homepage": "https://github.com/tannerlinsley/react-table#readme",
+  "homepage": "https://github.com/react-tools/react-table#readme",
  "repository": {
    "type": "git",
-    "url": "git+https://github.com/tannerlinsley/react-table.git"
+    "url": "git+https://github.com/react-tools/react-table.git"
  },
  "keywords": [
    "react",
@@ -15,72 +15,120 @@
    "datagrid"
  ],
  "main": "lib/index.js",
+  "module": "es/index.js",
  "files": [
    "src/",
+    "es/",
    "lib/",
    "react-table.js",
+    "react-table.min.js",
    "react-table.css",
    "media/*.png"
  ],
  "scripts": {
-    "build:node": "babel src --out-dir lib --source-maps inline",
-    "build:css": "rm -rf react-table.css && stylus src/index.styl --use ./node_modules/nib/lib/nib.js --compress -o react-table.css",
+    "build:cjs": "babel src --out-dir lib --source-maps inline",
+    "build:es": "BABEL_ENV=es babel src --out-dir es --source-maps inline",
+    "build:umd": "BABEL_ENV=umd rollup -c",
+    "build:umd-min": "BABEL_ENV=umd NODE_ENV=production rollup -c",
+    "build:css": "rimraf react-table.css && stylus src/index.styl --compress -o react-table.css && yarn 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",
-    "watch:css": "onchange 'src/**/*.styl' -i -- npm run build:css",
-    "test": "standard",
-    "umd": "rm -rf react-table.js && browserify lib/index.js -s reactTable -x react -t babelify -g uglifyify -o react-table.js",
-    "prepublish": "npm-run-all build:* && npm run umd",
-    "storybook": "start-storybook -p 8000 -c .storybook",
-    "deploy": "build-storybook && zab deploy"
+    "watch:js": "onchange 'src/**/*.js' -i -- yarn build:cjs",
+    "watch:css": "onchange 'src/**/*.styl' -i -- yarn build:css",
+    "test": "eslint src",
+    "build": "npm-run-all build:*",
+    "prepublish": "yarn build",
+    "postpublish": "git push --tags",
+    "docs": "yarn watch & cd docs && yarn && yarn start",
+    "docs:build": "yarn build && cd docs && yarn && yarn build"
  },
  "dependencies": {
    "classnames": "^2.2.5"
  },
  "peerDependencies": {
-    "react": "^15.x.x"
+    "react": "^15.x.x || ^16.x.x"
  },
  "devDependencies": {
-    "@kadira/storybook": "^2.35.1",
+    "autoprefixer": "^6.7.0",
    "babel-cli": "6.14.0",
    "babel-eslint": "6.1.2",
-    "babel-preset-es2015": "6.14.0",
-    "babel-preset-react": "6.11.1",
-    "babel-preset-stage-2": "6.13.0",
-    "babelify": "^7.3.0",
-    "browserify": "13.1.0",
-    "github-markdown-css": "^2.4.1",
-    "html-loader": "^0.4.4",
-    "markdown-loader": "^0.1.7",
-    "namor": "^0.3.0",
-    "nib": "^1.1.2",
-    "npm-run-all": "^3.1.1",
+    "babel-plugin-external-helpers": "^6.22.0",
+    "babel-plugin-transform-class-properties": "^6.24.1",
+    "babel-plugin-transform-object-rest-spread": "^6.26.0",
+    "babel-preset-env": "^1.6.1",
+    "babel-preset-react": "^6.24.1",
+    "eslint": "^4.1.1",
+    "eslint-config-react-tools": "^1.0.10",
+    "eslint-plugin-class-property": "^1.0.6",
+    "eslint-plugin-import": "^2.7.0",
+    "eslint-plugin-jsx-a11y": "^6.0.2",
+    "eslint-plugin-react": "^7.4.0",
+    "match-sorter": "^1.8.0",
+    "npm-run-all": "^4.1.2",
    "onchange": "^3.0.2",
+    "postcss-cli": "^2.6.0",
+    "prop-types": "^15.6.0",
    "react": "^15.4.2",
    "react-dom": "^15.4.2",
-    "standard": "^8.0.0",
-    "stylus": "^0.54.5",
-    "uglifyify": "3.0.3"
-  },
-  "browserify-shim": {
-    "react": "global:React"
-  },
-  "standard": {
-    "parser": "babel-eslint",
-    "ignore": [
-      "node_modules",
-      "dist",
-      "lib",
-      "example",
-      "react-table.js",
-      "stories"
-    ]
+    "react-json-tree": "^0.10.9",
+    "rimraf": "^2.6.1",
+    "rollup": "^0.55.3",
+    "rollup-plugin-babel": "^3.0.3",
+    "rollup-plugin-commonjs": "^8.3.0",
+    "rollup-plugin-node-resolve": "^3.0.2",
+    "rollup-plugin-replace": "^2.0.0",
+    "rollup-plugin-uglify": "^3.0.0",
+    "standard": "^10.0.2",
+    "stylus": "^0.54.5"
  },
  "babel": {
-    "presets": [
-      "es2015",
-      "stage-2",
-      "react"
-    ]
+    "env": {
+      "development": {
+        "presets": [
+          [
+            "env",
+            {
+              "modules": "commonjs"
+            }
+          ],
+          "react"
+        ],
+        "plugins": [
+          "transform-object-rest-spread",
+          "transform-class-properties"
+        ]
+      },
+      "es": {
+        "presets": [
+          [
+            "env",
+            {
+              "modules": false
+            }
+          ],
+          "react"
+        ],
+        "plugins": [
+          "transform-object-rest-spread",
+          "transform-class-properties"
+        ]
+      },
+      "umd": {
+        "presets": [
+          [
+            "env",
+            {
+              "modules": false
+            }
+          ],
+          "react"
+        ],
+        "plugins": [
+          "transform-object-rest-spread",
+          "transform-class-properties",
+          "external-helpers"
+        ]
+      }
+    }
  }
 }
@@ -0,0 +1,42 @@
+import nodeResolve from 'rollup-plugin-node-resolve'
+import babel from 'rollup-plugin-babel'
+import replace from 'rollup-plugin-replace'
+import commonjs from 'rollup-plugin-commonjs'
+import uglify from 'rollup-plugin-uglify'
+
+const env = process.env.NODE_ENV
+
+const config = {
+  input: 'src/index.js',
+  output: {
+    file: env === 'production' ? 'react-table.min.js' : 'react-table.js',
+    format: 'umd',
+    globals: {
+      react: 'React',
+    },
+    name: 'ReactTable',
+    exports: 'named',
+  },
+  external: ['react'],
+  plugins: [
+    nodeResolve(),
+    babel({
+      exclude: '**/node_modules/**',
+    }),
+    replace({
+      'process.env.NODE_ENV': JSON.stringify(env),
+    }),
+    commonjs(),
+  ],
+}
+
+if (env === 'production') {
+  config.plugins.push(uglify({
+    compress: {
+      dead_code: true,
+      warnings: false,
+    },
+  }))
+}
+
+export default config
@@ -0,0 +1,264 @@
+import React from 'react'
+import classnames from 'classnames'
+//
+import _ from './utils'
+import Pagination from './pagination'
+
+const emptyObj = () => ({})
+
+export default {
+  // General
+  data: [],
+  resolveData: data => data,
+  loading: false,
+  showPagination: true,
+  showPaginationTop: false,
+  showPaginationBottom: true,
+  showPageSizeOptions: true,
+  pageSizeOptions: [5, 10, 20, 25, 50, 100],
+  defaultPageSize: 20,
+  showPageJump: true,
+  collapseOnSortingChange: true,
+  collapseOnPageChange: true,
+  collapseOnDataChange: true,
+  freezeWhenExpanded: false,
+  sortable: true,
+  multiSort: true,
+  resizable: true,
+  filterable: false,
+  defaultSortDesc: false,
+  defaultSorted: [],
+  defaultFiltered: [],
+  defaultResized: [],
+  defaultExpanded: {},
+  // eslint-disable-next-line no-unused-vars
+  defaultFilterMethod: (filter, row, column) => {
+    const id = filter.pivotId || filter.id
+    return row[id] !== undefined ? String(row[id]).startsWith(filter.value) : true
+  },
+  // eslint-disable-next-line no-unused-vars
+  defaultSortMethod: (a, b, desc) => {
+    // force null and undefined to the bottom
+    a = a === null || a === undefined ? '' : a
+    b = b === null || b === undefined ? '' : b
+    // force any string values to lowercase
+    a = typeof a === 'string' ? a.toLowerCase() : a
+    b = typeof b === 'string' ? b.toLowerCase() : b
+    // Return either 1 or -1 to indicate a sort priority
+    if (a > b) {
+      return 1
+    }
+    if (a < b) {
+      return -1
+    }
+    // returning 0, undefined or any falsey value will use subsequent sorts or
+    // the index as a tiebreaker
+    return 0
+  },
+
+  // Controlled State Props
+  // page: undefined,
+  // pageSize: undefined,
+  // sorted: [],
+  // filtered: [],
+  // resized: [],
+  // expanded: {},
+
+  // Controlled State Callbacks
+  onPageChange: undefined,
+  onPageSizeChange: undefined,
+  onSortedChange: undefined,
+  onFilteredChange: undefined,
+  onResizedChange: undefined,
+  onExpandedChange: undefined,
+
+  // Pivoting
+  pivotBy: undefined,
+
+  // Key Constants
+  pivotValKey: '_pivotVal',
+  pivotIDKey: '_pivotID',
+  subRowsKey: '_subRows',
+  aggregatedKey: '_aggregated',
+  nestingLevelKey: '_nestingLevel',
+  originalKey: '_original',
+  indexKey: '_index',
+  groupedByPivotKey: '_groupedByPivot',
+
+  // Server-side Callbacks
+  onFetchData: () => null,
+
+  // Classes
+  className: '',
+  style: {},
+
+  // Component decorators
+  getProps: emptyObj,
+  getTableProps: emptyObj,
+  getTheadGroupProps: emptyObj,
+  getTheadGroupTrProps: emptyObj,
+  getTheadGroupThProps: emptyObj,
+  getTheadProps: emptyObj,
+  getTheadTrProps: emptyObj,
+  getTheadThProps: emptyObj,
+  getTheadFilterProps: emptyObj,
+  getTheadFilterTrProps: emptyObj,
+  getTheadFilterThProps: emptyObj,
+  getTbodyProps: emptyObj,
+  getTrGroupProps: emptyObj,
+  getTrProps: emptyObj,
+  getTdProps: emptyObj,
+  getTfootProps: emptyObj,
+  getTfootTrProps: emptyObj,
+  getTfootTdProps: emptyObj,
+  getPaginationProps: emptyObj,
+  getLoadingProps: emptyObj,
+  getNoDataProps: emptyObj,
+  getResizerProps: emptyObj,
+
+  // Global Column Defaults
+  column: {
+    // Renderers
+    Cell: undefined,
+    Header: undefined,
+    Footer: undefined,
+    Aggregated: undefined,
+    Pivot: undefined,
+    PivotValue: undefined,
+    Expander: undefined,
+    Filter: undefined,
+    // All Columns
+    sortable: undefined, // use table default
+    resizable: undefined, // use table default
+    filterable: undefined, // use table default
+    show: true,
+    minWidth: 100,
+    // Cells only
+    className: '',
+    style: {},
+    getProps: emptyObj,
+    // Pivot only
+    aggregate: undefined,
+    // Headers only
+    headerClassName: '',
+    headerStyle: {},
+    getHeaderProps: emptyObj,
+    // Footers only
+    footerClassName: '',
+    footerStyle: {},
+    getFooterProps: emptyObj,
+    filterMethod: undefined,
+    filterAll: false,
+    sortMethod: undefined,
+  },
+
+  // Global Expander Column Defaults
+  expanderDefaults: {
+    sortable: false,
+    resizable: false,
+    filterable: false,
+    width: 35,
+  },
+
+  pivotDefaults: {
+    // extend the defaults for pivoted columns here
+  },
+
+  // Text
+  previousText: 'Previous',
+  nextText: 'Next',
+  loadingText: 'Loading...',
+  noDataText: 'No rows found',
+  pageText: 'Page',
+  ofText: 'of',
+  rowsText: 'rows',
+
+  // Components
+  TableComponent: ({ children, className, ...rest }) => (
+    <div
+      className={classnames('rt-table', className)}
+      role="grid"
+      // tabIndex='0'
+      {...rest}
+    >
+      {children}
+    </div>
+  ),
+  TheadComponent: _.makeTemplateComponent('rt-thead', 'Thead'),
+  TbodyComponent: _.makeTemplateComponent('rt-tbody', 'Tbody'),
+  TrGroupComponent: ({ children, className, ...rest }) => (
+    <div className={classnames('rt-tr-group', className)} role="rowgroup" {...rest}>
+      {children}
+    </div>
+  ),
+  TrComponent: ({ children, className, ...rest }) => (
+    <div className={classnames('rt-tr', className)} role="row" {...rest}>
+      {children}
+    </div>
+  ),
+  ThComponent: ({
+    toggleSort, className, children, ...rest
+  }) => (
+    // eslint-disable-next-line jsx-a11y/click-events-have-key-events
+    <div
+      className={classnames('rt-th', className)}
+      onClick={e => toggleSort && toggleSort(e)}
+      role="columnheader"
+      tabIndex="-1" // Resolves eslint issues without implementing keyboard navigation incorrectly
+      {...rest}
+    >
+      {children}
+    </div>
+  ),
+  TdComponent: ({
+    toggleSort, className, children, ...rest
+  }) => (
+    <div className={classnames('rt-td', className)} role="gridcell" {...rest}>
+      {children}
+    </div>
+  ),
+  TfootComponent: _.makeTemplateComponent('rt-tfoot', 'Tfoot'),
+  FilterComponent: ({ filter, onChange }) => (
+    <input
+      type="text"
+      style={{
+        width: '100%',
+      }}
+      value={filter ? filter.value : ''}
+      onChange={event => onChange(event.target.value)}
+    />
+  ),
+  ExpanderComponent: ({ isExpanded }) => (
+    <div className={classnames('rt-expander', isExpanded && '-open')}>&bull;</div>
+  ),
+  PivotValueComponent: ({ subRows, value }) => (
+    <span>
+      {value} {subRows && `(${subRows.length})`}
+    </span>
+  ),
+  AggregatedComponent: ({ subRows, column }) => {
+    const previewValues = subRows.filter(d => typeof d[column.id] !== 'undefined').map((row, i) => (
+      // eslint-disable-next-line react/no-array-index-key
+      <span key={i}>
+        {row[column.id]}
+        {i < subRows.length - 1 ? ', ' : ''}
+      </span>
+    ))
+    return <span>{previewValues}</span>
+  },
+  PivotComponent: undefined, // this is a computed default generated using
+  // the ExpanderComponent and PivotValueComponent at run-time in methods.js
+  PaginationComponent: Pagination,
+  PreviousComponent: undefined,
+  NextComponent: undefined,
+  LoadingComponent: ({
+    className, loading, loadingText, ...rest
+  }) => (
+    <div className={classnames('-loading', { '-active': loading }, className)} {...rest}>
+      <div className="-loading-inner">{loadingText}</div>
+    </div>
+  ),
+  NoDataComponent: _.makeTemplateComponent('rt-noData', 'NoData'),
+  ResizerComponent: _.makeTemplateComponent('rt-resizer', 'Resizer'),
+  PadRowComponent: () => <span>&nbsp;</span>,
+}
@@ -0,0 +1,139 @@
+<div style="text-align:center;">
+  <a href="https://github.com/react-tools/react-table" target="\_parent"><img src="https://github.com/react-tools/media/raw/master/logo-react-table.png" alt="React Table Logo" style="width:450px;"/></a>
+</div>
+
+# ReactTable - expanding with HOCs
+
+This documentation is about expanding ReactTable using Higher Order Components/Functions.
+
+## Covered in this README
+
+* A Brief explanation of HOCs and why they are a good approach for ReactTable enhancements
+* Documentation of the currently available HOCs
+* TreeTable
+* SelectTable
+* Documentation of the standard for writing HOCs with ReactTable
+
+## What are HOCs and why use them with ReactTable
+
+HOCs (or Higher Order Components/Functions) are either a React Component (or a function that returns a React Component)
+that are used to enhance the functionality of an existing component. How much you can enhance depends on the props that
+the component exposes.
+
+Fortunately, ReactTable exposes a LOT of functionality as props to the component. In some cases there are too many
+props to keep track of and that is where HOCs come in.
+
+You can write a HOC that just focusses on the additional functionality you want to enhance and keep those enhancements to
+reuse over and over again when you need them. You don't have to edit the ReactSource code, just wrap ReactTable in one or
+more HOCs (more on some issues related to chaining HOCs later) that provide the additional functionality you want to expose.
+
+The most obvious HOC is one that can add `checkbox` or select functionality. The HOC included provides `select` functionality
+that allows the developer to specify if they want a `checkbox` or `radio` style of select column. The implementation of the
+selection is recorded (e.g. in component state, Redux, etc.) and how to manage multiple selections. The HOC really only handles
+the rendering pieces.
+
+But there is more documentation on the `select` HOC below.
+
+## Currently Available HOCs
+
+### TreeTable
+
+TreeTable takes over the rendering of the generated pivot rows of ReactTable so that they appear more like an expandable Tree.
+
+It accomplishes this by rendering a 100% wide div and then only rendering the cell that controls the pivot at that level.
+
+Using it is as simple as doing the following:
+
+```javascript
+import ReactTable from "react-table";
+import treeTableHOC from "react-table/lib/hoc/treeTable";
+
+const TreeTable = treeTableHOC(ReactTable);
+```
+
+After you have done the above, you can then use `TreeTable` just as you would `ReactTable` but it will render pivots using
+the Tree style described above.
+
+### SelectTable
+
+SelectTable is a little trickier. The HOCs attempt to avoid adding additional state and, as there is no internal ID for a row that
+can be relied on to be static (ReactTable just reuses indexes when rendering) the developer has to maintain the state outside of even
+the wrapped component. So it is largely based on callbacks.
+
+You include the HOC in the same manner as you would for the treeTableHOC but then need to provide the following overrides:
+
+* isSelected - returns `true` if the key passed is selected otherwise it should return `false`
+* selectAll - a property that indicates if the selectAll is set (`true|false`)
+* toggleAll - called when the user clicks the `selectAll` checkbox/radio
+* toggleSelection - called when the use clicks a specific checkbox/radio in a row
+* selectType - either `checkbox|radio` to indicate what type of selection is required
+
+**Note:** The select field defaults to the accessor `_id` property in order to render the select field for that particular row. If your objects have different
+unique ID fields, make sure to tell React Table that by passing it the `keyField` property.
+
+```Javascript
+<ReactTable keyField='id' />
+```
+
+In the case of `radio` there is no `selectAll` displayed but the developer is responsible for only making one selection in
+the controlling component's state. You could select multiple but it wouldn't make sense and you should use `checkbox` instead.
+
+You also have to decide what `selectAll` means. Given ReactTable is a paged solution there are other records off-page. When someone
+selects the `selectAll` checkbox, should it mark every possible record, only what might be visible to due a Filter or only those items
+on the current page?
+
+The example opts for the middle approach so it gets a `ref` to the ReactTable instance and pulls the `sortedData` out of the resolved
+state (then walks through those records and pulls their ID into the `selection` state of the controlling component).
+
+You can also replace the input component that is used to render the select box and select all box:
+
+* SelectAllInputComponent - the checkbox in the top left corner
+* SelectInputComponent - the checkbox used on a row
+
+### SelectTreeTable
+
+SelectTreeTable is a combination of TreeTable and SelectTable.
+
+To function correctly the chain has to be in the correct order as follows (see the comments in the guid on HOCs below).
+
+```Javascript
+const SelectTreeTable = selectTableHOC(treeTableHOC(ReactTable));
+```
+
+In this particular instance it is (probably) because the functions need access to the state on the wrapped component to manage
+the selected items. Although that is not totally clearly the issue.
+
+## HOC Guide for ReactTable
+
+There are a few rules required when writing a HOC for ReactTable (other than meeting the normal lint standards - which are
+still being developed).
+
+Firstly, there are issues with `ref` when you write a HOC. Consider a deeply nested component wrapped in multiple HOCs...
+
+A HOC in the middle of the chain requires access to the instance of the component it thinks it is wrapping but there is at
+least one other wrapper in the way. The challenge is: How do I get to the actual wrapped component?
+
+Each HOC is required to be a React Class so that a `ref` can be obtained against each component:
+
+```Javascript
+<Component ... ref={r => this.wrappedInstance = r} />
+```
+
+_NOTE:_ "Component" can also be the `<ReactTable />` instance.
+
+Then the following method needs
+to be placed on the class so that it exposes the correct instance of ReactTable:
+
+```Javascript
+getWrappedInstance() {
+  if (!this.wrappedInstance) console.warn('<component name here> - No wrapped instance')
+  if (this.wrappedInstance.getWrappedInstance) return this.wrappedInstance.getWrappedInstance()
+  else return this.wrappedInstance
+}
+```
+
+Essentially this will walk down the chain (if there are chained HOCs) and stop when it gets to the end and return the wrapped instance.
+
+Finally, sometimes the chains need to be in a specific order to function correctly. It is not clear if this is just an architectural
+issue or if it would be better solved using a library like `recompose`. Anyone who is able to contribute a reliable solution to this
+is welcome to submit a PR.
@@ -0,0 +1,115 @@
+/* eslint-disable */
+
+import React from 'react'
+
+const defaultSelectInputComponent = props => {
+  return (
+    <input
+      type={props.selectType || 'checkbox'}
+      checked={props.checked}
+      onClick={e => {
+        const { shiftKey } = e
+        e.stopPropagation()
+        props.onClick(props.id, shiftKey, props.row)
+      }}
+      onChange={() => {}}
+    />
+  )
+}
+
+export default Component => {
+  const wrapper = class RTSelectTable extends React.Component {
+    constructor(props) {
+      super(props)
+    }
+
+    rowSelector(row) {
+      if (!row || !row.hasOwnProperty(this.props.keyField)) return null
+      const { toggleSelection, selectType, keyField } = this.props
+      const checked = this.props.isSelected(row[this.props.keyField])
+      const inputProps = {
+        checked,
+        onClick: toggleSelection,
+        selectType,
+        id: row[keyField],
+        row,
+      }
+      return React.createElement(this.props.SelectInputComponent, inputProps)
+    }
+
+    headSelector(row) {
+      const { selectType } = this.props
+      if (selectType === 'radio') return null
+
+      const { toggleAll, selectAll: checked, SelectAllInputComponent } = this.props
+      const inputProps = {
+        checked,
+        onClick: toggleAll,
+        selectType,
+      }
+
+      return React.createElement(SelectAllInputComponent, inputProps)
+    }
+
+    // this is so we can expose the underlying ReactTable to get at the sortedData for selectAll
+    getWrappedInstance() {
+      if (!this.wrappedInstance) console.warn('RTSelectTable - No wrapped instance')
+      if (this.wrappedInstance.getWrappedInstance) return this.wrappedInstance.getWrappedInstance()
+      else return this.wrappedInstance
+    }
+
+    render() {
+      const {
+        columns: originalCols,
+        isSelected,
+        toggleSelection,
+        toggleAll,
+        keyField,
+        selectAll,
+        selectType,
+        selectWidth,
+        SelectAllInputComponent,
+        SelectInputComponent,
+        ...rest
+      } = this.props
+      const select = {
+        id: '_selector',
+        accessor: () => 'x', // this value is not important
+        Header: this.headSelector.bind(this),
+        Cell: ci => {
+          return this.rowSelector.bind(this)(ci.original)
+        },
+        width: selectWidth || 30,
+        filterable: false,
+        sortable: false,
+        resizable: false,
+        style: { textAlign: 'center' },
+      }
+      const columns = [select, ...originalCols]
+      const extra = {
+        columns,
+      }
+      return <Component {...rest} {...extra} ref={r => (this.wrappedInstance = r)} />
+    }
+  }
+
+  wrapper.displayName = 'RTSelectTable'
+  wrapper.defaultProps = {
+    keyField: '_id',
+    isSelected: key => {
+      console.log('No isSelected handler provided:', { key })
+    },
+    selectAll: false,
+    toggleSelection: (key, shift, row) => {
+      console.log('No toggleSelection handler provided:', { key, shift, row })
+    },
+    toggleAll: () => {
+      console.log('No toggleAll handler provided.')
+    },
+    selectType: 'check',
+    SelectInputComponent: defaultSelectInputComponent,
+    SelectAllInputComponent: defaultSelectInputComponent,
+  }
+
+  return wrapper
+}
@@ -0,0 +1,75 @@
+/* eslint-disable */
+
+import React from 'react'
+
+export default Component => {
+  const wrapper = class RTTreeTable extends React.Component {
+    constructor(props) {
+      super(props)
+      this.getWrappedInstance.bind(this)
+      this.TrComponent.bind(this)
+      this.getTrProps.bind(this)
+    }
+
+    // this is so we can expose the underlying ReactTable to get at the sortedData for selectAll
+    getWrappedInstance = () => {
+      if (!this.wrappedInstance) console.warn('RTTreeTable - No wrapped instance')
+      if (this.wrappedInstance.getWrappedInstance) return this.wrappedInstance.getWrappedInstance()
+      else return this.wrappedInstance
+    }
+
+    TrComponent = props => {
+      const { ri, ...rest } = props
+      if (ri && ri.groupedByPivot) {
+        const cell = { ...props.children[ri.level] }
+
+        cell.props.style.flex = 'unset'
+        cell.props.style.width = '100%'
+        cell.props.style.maxWidth = 'unset'
+        cell.props.style.paddingLeft = `${this.props.treeTableIndent * ri.level}px`
+        // cell.props.style.backgroundColor = '#DDD';
+        cell.props.style.borderBottom = '1px solid rgba(128,128,128,0.2)'
+
+        return (
+          <div className={`rt-tr ${rest.className}`} style={rest.style}>
+            {cell}
+          </div>
+        )
+      }
+      return <Component.defaultProps.TrComponent {...rest} />
+    }
+
+    getTrProps = (state, ri, ci, instance) => {
+      return { ri }
+    }
+
+    render() {
+      const { columns, treeTableIndent, ...rest } = this.props
+      const { TrComponent, getTrProps } = this
+      const extra = {
+        columns: columns.map(col => {
+          let column = col
+          if (rest.pivotBy && rest.pivotBy.includes(col.accessor)) {
+            column = {
+              accessor: col.accessor,
+              width: `${treeTableIndent}px`,
+              show: false,
+              Header: '',
+            }
+          }
+          return column
+        }),
+        TrComponent,
+        getTrProps,
+      }
+
+      return <Component {...rest} {...extra} ref={r => (this.wrappedInstance = r)} />
+    }
+  }
+  wrapper.displayName = 'RTTreeTable'
+  wrapper.defaultProps = {
+    treeTableIndent: 10,
+  }
+
+  return wrapper
+}
@@ -1,15 +1,25 @@
-@import 'nib'
-
 $easeOutQuad = cubic-bezier(0.250, 0.460, 0.450, 0.940)
 $easeOutBack = cubic-bezier(0.175,  0.885, 0.320, 1.275)
 $expandSize = 7px

+input-select-style()
+  border: 1px solid rgba(0,0,0,0.1)
+  background: white
+  padding: 5px 7px
+  font-size: inherit
+  border-radius: 3px
+  font-weight: normal
+  outline:none
+
 .ReactTable
  position:relative
+  display: flex
+  flex-direction: column
  border: 1px solid alpha(black, .1)
  *
    box-sizing: border-box
  .rt-table
+    flex: auto 1
    display: flex
    flex-direction: column
    align-items: stretch
@@ -18,12 +28,28 @@ $expandSize = 7px
    overflow: auto

  .rt-thead
+    flex: 1 0 auto
    display: flex
    flex-direction: column
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+
    &.-headerGroups
      background: alpha(black, .03)
      border-bottom: 1px solid alpha(black, .05)

+    &.-filters
+      border-bottom: 1px solid alpha(black, 0.05)
+
+      input
+      select
+        input-select-style();
+
+      .rt-th
+        border-right: 1px solid alpha(black, 0.02)
+
    &.-header
      box-shadow: 0 2px 15px 0px alpha(black, .15)

@@ -32,7 +58,9 @@ $expandSize = 7px

    .rt-th
    .rt-td
-      color: black
+      padding: 5px 5px
+      line-height: normal
+      position: relative
      border-right: 1px solid alpha(black, .05)
      transition box-shadow .3s $easeOutBack
      box-shadow:inset 0 0 0 0 transparent
@@ -44,9 +72,46 @@ $expandSize = 7px
        cursor: pointer
      &:last-child
        border-right: 0
+
+    .rt-resizable-header
+      overflow: visible
+      &:last-child
+        overflow: hidden
+
+    .rt-resizable-header-content
+      overflow: hidden
+      text-overflow: ellipsis
+
+    .rt-header-pivot
+      border-right-color: #f7f7f7
+
+    .rt-header-pivot:after, .rt-header-pivot:before
+      left: 100%
+      top: 50%
+      border: solid transparent
+      content: " "
+      height: 0
+      width: 0
+      position: absolute
+      pointer-events: none
+
+    .rt-header-pivot:after
+      border-color: rgba(255, 255, 255, 0)
+      border-left-color: #FFF
+      border-width: 8px
+      margin-top: -8px
+
+    .rt-header-pivot:before
+      border-color: rgba(102, 102, 102, 0)
+      border-left-color: #f7f7f7
+      border-width: 10px
+      margin-top: -10px
+
  .rt-tbody
+    flex: 99999 1 auto
    display: flex
    flex-direction: column
+    overflow: auto
    // z-index:0
    .rt-tr-group
      border-bottom: solid 1px alpha(black, .05)
@@ -56,13 +121,16 @@ $expandSize = 7px
      border-right:1px solid alpha(black, .02)
      &:last-child
        border-right:0
-    .rt-pivot
+    .rt-expandable
      cursor: pointer
+      text-overflow: clip
  .rt-tr-group
+    flex: 1 0 auto
    display: flex
    flex-direction: column
    align-items: stretch
  .rt-tr
+    flex: 1 0 auto
    display: inline-flex
  .rt-th
  .rt-td
@@ -103,6 +171,27 @@ $expandSize = 7px
    &.-open:after
        transform: translate(-50%, -50%) rotate(0deg)

+  .rt-resizer
+    display: inline-block
+    position: absolute
+    width: 36px
+    top: 0
+    bottom: 0
+    right: -18px
+    cursor: col-resize
+    z-index: 10
+
+  .rt-tfoot
+    flex: 1 0 auto
+    display: flex
+    flex-direction: column
+    box-shadow: 0 0px 15px 0px alpha(black, .15)
+
+    .rt-td
+      border-right:1px solid alpha(black, .05)
+      &:last-child
+        border-right:0
+
  &.-striped
    .rt-tr.-odd
      background: alpha(black, .03)
@@ -119,12 +208,17 @@ $expandSize = 7px
    flex-wrap: wrap
    padding: 3px
    box-shadow: 0 0px 15px 0px alpha(black, .1)
+    border-top: 2px solid alpha(black, .1)
+
+    input
+    select
+      input-select-style()

    .-btn
      appearance:none
      display:block
      width:100%
-      height: 100%
+      height:100%
      border: 0
      border-radius: 3px
      padding: 6px
@@ -172,6 +266,18 @@ $expandSize = 7px
    .-pageSizeOptions
      margin: 3px 10px

+  .rt-noData
+    display:block
+    position:absolute
+    left:50%
+    top:50%
+    transform: translate(-50%, -50%)
+    background: alpha(white, .8)
+    transition: all .3s ease
+    z-index: 1
+    pointer-events: none
+    padding: 20px
+    color: alpha(black, .5)

  .-loading
    display:block
@@ -182,7 +288,7 @@ $expandSize = 7px
    bottom:0
    background: alpha(white, .8)
    transition: all .3s ease
-    z-index: 2
+    z-index: -1
    opacity: 0
    pointer-events: none

@@ -200,33 +306,14 @@ $expandSize = 7px

    &.-active
      opacity: 1
+      z-index: 2
      pointer-events: all
      > div
        transform: translateY(50%)

-  input
-  select
-    appearance: none
-    border: 1px solid rgba(0,0,0,0.1)
-    background: white
-    padding: 5px 7px
-    font-size: inherit
-    border-radius: 3px
-    font-weight: normal
-    outline:none
-
-  .select-wrap
-    position:relative
-    display:inline-block
-    select
-      padding: 5px 15px 5px 7px
-      min-width:100px
-    &:after
-      content: ''
-      position: absolute
-      right: 8px
-      top: 50%
-      transform: translate(0, -50%)
-      border-color: #999 transparent transparent
-      border-style: solid
-      border-width: 5px 5px 2.5px
+  .rt-resizing
+    .rt-th
+    .rt-td
+      transition: none!important
+      cursor: col-resize
+      user-select none
@@ -0,0 +1,128 @@
+export default Base =>
+  class extends Base {
+    componentWillMount () {
+      this.setStateWithData(this.getDataModel(this.getResolvedState()))
+    }
+
+    componentDidMount () {
+      this.fireFetchData()
+    }
+
+    componentWillReceiveProps (nextProps, nextState) {
+      const oldState = this.getResolvedState()
+      const newState = this.getResolvedState(nextProps, nextState)
+
+      // Do a deep compare of new and old `defaultOption` and
+      // if they are different reset `option = defaultOption`
+      const defaultableOptions = ['sorted', 'filtered', 'resized', 'expanded']
+      defaultableOptions.forEach(x => {
+        const defaultName = `default${x.charAt(0).toUpperCase() + x.slice(1)}`
+        if (JSON.stringify(oldState[defaultName]) !== JSON.stringify(newState[defaultName])) {
+          newState[x] = newState[defaultName]
+        }
+      })
+
+      // If they change these table options, we need to reset defaults
+      // or else we could get into a state where the user has changed the UI
+      // and then disabled the ability to change it back.
+      // e.g. If `filterable` has changed, set `filtered = defaultFiltered`
+      const resettableOptions = ['sortable', 'filterable', 'resizable']
+      resettableOptions.forEach(x => {
+        if (oldState[x] !== newState[x]) {
+          const baseName = x.replace('able', '')
+          const optionName = `${baseName}ed`
+          const defaultName = `default${optionName.charAt(0).toUpperCase() + optionName.slice(1)}`
+          newState[optionName] = newState[defaultName]
+        }
+      })
+
+      // Props that trigger a data update
+      if (
+        oldState.data !== newState.data ||
+        oldState.columns !== newState.columns ||
+        oldState.pivotBy !== newState.pivotBy ||
+        oldState.sorted !== newState.sorted ||
+        oldState.filtered !== newState.filtered
+      ) {
+        this.setStateWithData(this.getDataModel(newState))
+      }
+    }
+
+    setStateWithData (newState, cb) {
+      const oldState = this.getResolvedState()
+      const newResolvedState = this.getResolvedState({}, newState)
+      const { freezeWhenExpanded } = newResolvedState
+
+      // Default to unfrozen state
+      newResolvedState.frozen = false
+
+      // If freezeWhenExpanded is set, check for frozen conditions
+      if (freezeWhenExpanded) {
+        // if any rows are expanded, freeze the existing data and sorting
+        const keys = Object.keys(newResolvedState.expanded)
+        for (let i = 0; i < keys.length; i += 1) {
+          if (newResolvedState.expanded[keys[i]]) {
+            newResolvedState.frozen = true
+            break
+          }
+        }
+      }
+
+      // If the data isn't frozen and either the data or
+      // sorting model has changed, update the data
+      if (
+        (oldState.frozen && !newResolvedState.frozen) ||
+        oldState.sorted !== newResolvedState.sorted ||
+        oldState.filtered !== newResolvedState.filtered ||
+        oldState.showFilters !== newResolvedState.showFilters ||
+        (!newResolvedState.frozen && oldState.resolvedData !== newResolvedState.resolvedData)
+      ) {
+        // Handle collapseOnsortedChange & collapseOnDataChange
+        if (
+          (oldState.sorted !== newResolvedState.sorted && this.props.collapseOnSortingChange) ||
+          oldState.filtered !== newResolvedState.filtered ||
+          oldState.showFilters !== newResolvedState.showFilters ||
+          (oldState.sortedData &&
+            !newResolvedState.frozen &&
+            oldState.resolvedData !== newResolvedState.resolvedData &&
+            this.props.collapseOnDataChange)
+        ) {
+          newResolvedState.expanded = {}
+        }
+
+        Object.assign(newResolvedState, this.getSortedData(newResolvedState))
+      }
+
+      // Set page to 0 if filters change
+      if (oldState.filtered !== newResolvedState.filtered) {
+        newResolvedState.page = 0
+      }
+
+      // Calculate pageSize all the time
+      if (newResolvedState.sortedData) {
+        newResolvedState.pages = newResolvedState.manual
+          ? newResolvedState.pages
+          : Math.ceil(newResolvedState.sortedData.length / newResolvedState.pageSize)
+        newResolvedState.page = Math.max(
+          newResolvedState.page >= newResolvedState.pages
+            ? newResolvedState.pages - 1
+            : newResolvedState.page,
+          0
+        )
+      }
+
+      return this.setState(newResolvedState, () => {
+        if (cb) {
+          cb()
+        }
+        if (
+          oldState.page !== newResolvedState.page ||
+          oldState.pageSize !== newResolvedState.pageSize ||
+          oldState.sorted !== newResolvedState.sorted ||
+          oldState.filtered !== newResolvedState.filtered
+        ) {
+          this.fireFetchData()
+        }
+      })
+    }
+  }
@@ -0,0 +1,670 @@
+import React from 'react'
+import _ from './utils'
+
+export default Base =>
+  class extends Base {
+    getResolvedState (props, state) {
+      const resolvedState = {
+        ..._.compactObject(this.state),
+        ..._.compactObject(this.props),
+        ..._.compactObject(state),
+        ..._.compactObject(props),
+      }
+      return resolvedState
+    }
+
+    getDataModel (newState) {
+      const {
+        columns,
+        pivotBy = [],
+        data,
+        resolveData,
+        pivotIDKey,
+        pivotValKey,
+        subRowsKey,
+        aggregatedKey,
+        nestingLevelKey,
+        originalKey,
+        indexKey,
+        groupedByPivotKey,
+        SubComponent,
+      } = newState
+
+      // Determine Header Groups
+      let hasHeaderGroups = false
+      columns.forEach(column => {
+        if (column.columns) {
+          hasHeaderGroups = true
+        }
+      })
+
+      let columnsWithExpander = [...columns]
+
+      let expanderColumn = columns.find(
+        col => col.expander || (col.columns && col.columns.some(col2 => col2.expander))
+      )
+      // The actual expander might be in the columns field of a group column
+      if (expanderColumn && !expanderColumn.expander) {
+        expanderColumn = expanderColumn.columns.find(col => col.expander)
+      }
+
+      // If we have SubComponent's we need to make sure we have an expander column
+      if (SubComponent && !expanderColumn) {
+        expanderColumn = { expander: true }
+        columnsWithExpander = [expanderColumn, ...columnsWithExpander]
+      }
+
+      const makeDecoratedColumn = (column, parentColumn) => {
+        let dcol
+        if (column.expander) {
+          dcol = {
+            ...this.props.column,
+            ...this.props.expanderDefaults,
+            ...column,
+          }
+        } else {
+          dcol = {
+            ...this.props.column,
+            ...column,
+          }
+        }
+
+        // Ensure minWidth is not greater than maxWidth if set
+        if (dcol.maxWidth < dcol.minWidth) {
+          dcol.minWidth = dcol.maxWidth
+        }
+
+        if (parentColumn) {
+          dcol.parentColumn = parentColumn
+        }
+
+        // First check for string accessor
+        if (typeof dcol.accessor === 'string') {
+          dcol.id = dcol.id || dcol.accessor
+          const accessorString = dcol.accessor
+          dcol.accessor = row => _.get(row, accessorString)
+          return dcol
+        }
+
+        // Fall back to functional accessor (but require an ID)
+        if (dcol.accessor && !dcol.id) {
+          console.warn(dcol)
+          throw new Error(
+            'A column id is required if using a non-string accessor for column above.'
+          )
+        }
+
+        // Fall back to an undefined accessor
+        if (!dcol.accessor) {
+          dcol.accessor = () => undefined
+        }
+
+        return dcol
+      }
+
+      const allDecoratedColumns = []
+
+      // Decorate the columns
+      const decorateAndAddToAll = (column, parentColumn) => {
+        const decoratedColumn = makeDecoratedColumn(column, parentColumn)
+        allDecoratedColumns.push(decoratedColumn)
+        return decoratedColumn
+      }
+
+      const decoratedColumns = columnsWithExpander.map(column => {
+        if (column.columns) {
+          return {
+            ...column,
+            columns: column.columns.map(d => decorateAndAddToAll(d, column)),
+          }
+        }
+        return decorateAndAddToAll(column)
+      })
+
+      // Build the visible columns, headers and flat column list
+      let visibleColumns = decoratedColumns.slice()
+      let allVisibleColumns = []
+
+      visibleColumns = visibleColumns.map(column => {
+        if (column.columns) {
+          const visibleSubColumns = column.columns.filter(
+            d => (pivotBy.indexOf(d.id) > -1 ? false : _.getFirstDefined(d.show, true))
+          )
+          return {
+            ...column,
+            columns: visibleSubColumns,
+          }
+        }
+        return column
+      })
+
+      visibleColumns = visibleColumns.filter(
+        column =>
+          column.columns
+            ? column.columns.length
+            : pivotBy.indexOf(column.id) > -1
+              ? false
+              : _.getFirstDefined(column.show, true)
+      )
+
+      // Find any custom pivot location
+      const pivotIndex = visibleColumns.findIndex(col => col.pivot)
+
+      // Handle Pivot Columns
+      if (pivotBy.length) {
+        // Retrieve the pivot columns in the correct pivot order
+        const pivotColumns = []
+        pivotBy.forEach(pivotID => {
+          const found = allDecoratedColumns.find(d => d.id === pivotID)
+          if (found) {
+            pivotColumns.push(found)
+          }
+        })
+
+        const PivotParentColumn = pivotColumns.reduce(
+          (prev, current) => prev && prev === current.parentColumn && current.parentColumn,
+          pivotColumns[0].parentColumn
+        )
+
+        let PivotGroupHeader = hasHeaderGroups && PivotParentColumn.Header
+        PivotGroupHeader = PivotGroupHeader || (() => <strong>Pivoted</strong>)
+
+        let pivotColumnGroup = {
+          Header: PivotGroupHeader,
+          columns: pivotColumns.map(col => ({
+            ...this.props.pivotDefaults,
+            ...col,
+            pivoted: true,
+          })),
+        }
+
+        // Place the pivotColumns back into the visibleColumns
+        if (pivotIndex >= 0) {
+          pivotColumnGroup = {
+            ...visibleColumns[pivotIndex],
+            ...pivotColumnGroup,
+          }
+          visibleColumns.splice(pivotIndex, 1, pivotColumnGroup)
+        } else {
+          visibleColumns.unshift(pivotColumnGroup)
+        }
+      }
+
+      // Build Header Groups
+      const headerGroups = []
+      let currentSpan = []
+
+      // A convenience function to add a header and reset the currentSpan
+      const addHeader = (columns, column) => {
+        headerGroups.push({
+          ...this.props.column,
+          ...column,
+          columns,
+        })
+        currentSpan = []
+      }
+
+      // Build flast list of allVisibleColumns and HeaderGroups
+      visibleColumns.forEach(column => {
+        if (column.columns) {
+          allVisibleColumns = allVisibleColumns.concat(column.columns)
+          if (currentSpan.length > 0) {
+            addHeader(currentSpan)
+          }
+          addHeader(column.columns, column)
+          return
+        }
+        allVisibleColumns.push(column)
+        currentSpan.push(column)
+      })
+      if (hasHeaderGroups && currentSpan.length > 0) {
+        addHeader(currentSpan)
+      }
+
+      // Access the data
+      const accessRow = (d, i, level = 0) => {
+        const row = {
+          [originalKey]: d,
+          [indexKey]: i,
+          [subRowsKey]: d[subRowsKey],
+          [nestingLevelKey]: level,
+        }
+        allDecoratedColumns.forEach(column => {
+          if (column.expander) return
+          row[column.id] = column.accessor(d)
+        })
+        if (row[subRowsKey]) {
+          row[subRowsKey] = row[subRowsKey].map((d, i) => accessRow(d, i, level + 1))
+        }
+        return row
+      }
+      let resolvedData = resolveData(data).map((d, i) => accessRow(d, i))
+
+      // TODO: Make it possible to fabricate nested rows without pivoting
+      const aggregatingColumns = allVisibleColumns.filter(d => !d.expander && d.aggregate)
+
+      // If pivoting, recursively group the data
+      const aggregate = rows => {
+        const aggregationValues = {}
+        aggregatingColumns.forEach(column => {
+          const values = rows.map(d => d[column.id])
+          aggregationValues[column.id] = column.aggregate(values, rows)
+        })
+        return aggregationValues
+      }
+      if (pivotBy.length) {
+        const groupRecursively = (rows, keys, i = 0) => {
+          // This is the last level, just return the rows
+          if (i === keys.length) {
+            return rows
+          }
+          // Group the rows together for this level
+          let groupedRows = Object.entries(_.groupBy(rows, keys[i])).map(([key, value]) => ({
+            [pivotIDKey]: keys[i],
+            [pivotValKey]: key,
+            [keys[i]]: key,
+            [subRowsKey]: value,
+            [nestingLevelKey]: i,
+            [groupedByPivotKey]: true,
+          }))
+          // Recurse into the subRows
+          groupedRows = groupedRows.map(rowGroup => {
+            const subRows = groupRecursively(rowGroup[subRowsKey], keys, i + 1)
+            return {
+              ...rowGroup,
+              [subRowsKey]: subRows,
+              [aggregatedKey]: true,
+              ...aggregate(subRows),
+            }
+          })
+          return groupedRows
+        }
+        resolvedData = groupRecursively(resolvedData, pivotBy)
+      }
+
+      return {
+        ...newState,
+        resolvedData,
+        allVisibleColumns,
+        headerGroups,
+        allDecoratedColumns,
+        hasHeaderGroups,
+      }
+    }
+
+    getSortedData (resolvedState) {
+      const {
+        manual,
+        sorted,
+        filtered,
+        defaultFilterMethod,
+        resolvedData,
+        allVisibleColumns,
+        allDecoratedColumns,
+      } = resolvedState
+
+      const sortMethodsByColumnID = {}
+
+      allDecoratedColumns.filter(col => col.sortMethod).forEach(col => {
+        sortMethodsByColumnID[col.id] = col.sortMethod
+      })
+
+      // Resolve the data from either manual data or sorted data
+      return {
+        sortedData: manual
+          ? resolvedData
+          : this.sortData(
+            this.filterData(resolvedData, filtered, defaultFilterMethod, allVisibleColumns),
+            sorted,
+            sortMethodsByColumnID
+          ),
+      }
+    }
+
+    fireFetchData () {
+      this.props.onFetchData(this.getResolvedState(), this)
+    }
+
+    getPropOrState (key) {
+      return _.getFirstDefined(this.props[key], this.state[key])
+    }
+
+    getStateOrProp (key) {
+      return _.getFirstDefined(this.state[key], this.props[key])
+    }
+
+    filterData (data, filtered, defaultFilterMethod, allVisibleColumns) {
+      let filteredData = data
+
+      if (filtered.length) {
+        filteredData = filtered.reduce((filteredSoFar, nextFilter) => {
+          const column = allVisibleColumns.find(x => x.id === nextFilter.id)
+
+          // Don't filter hidden columns or columns that have had their filters disabled
+          if (!column || column.filterable === false) {
+            return filteredSoFar
+          }
+
+          const filterMethod = column.filterMethod || defaultFilterMethod
+
+          // If 'filterAll' is set to true, pass the entire dataset to the filter method
+          if (column.filterAll) {
+            return filterMethod(nextFilter, filteredSoFar, column)
+          }
+          return filteredSoFar.filter(row => filterMethod(nextFilter, row, column))
+        }, filteredData)
+
+        // Apply the filter to the subrows if we are pivoting, and then
+        // filter any rows without subcolumns because it would be strange to show
+        filteredData = filteredData
+          .map(row => {
+            if (!row[this.props.subRowsKey]) {
+              return row
+            }
+            return {
+              ...row,
+              [this.props.subRowsKey]: this.filterData(
+                row[this.props.subRowsKey],
+                filtered,
+                defaultFilterMethod,
+                allVisibleColumns
+              ),
+            }
+          })
+          .filter(row => {
+            if (!row[this.props.subRowsKey]) {
+              return true
+            }
+            return row[this.props.subRowsKey].length > 0
+          })
+      }
+
+      return filteredData
+    }
+
+    sortData (data, sorted, sortMethodsByColumnID = {}) {
+      if (!sorted.length) {
+        return data
+      }
+
+      const sortedData = (this.props.orderByMethod || _.orderBy)(
+        data,
+        sorted.map(sort => {
+          // Support custom sorting methods for each column
+          if (sortMethodsByColumnID[sort.id]) {
+            return (a, b) => sortMethodsByColumnID[sort.id](a[sort.id], b[sort.id], sort.desc)
+          }
+          return (a, b) => this.props.defaultSortMethod(a[sort.id], b[sort.id], sort.desc)
+        }),
+        sorted.map(d => !d.desc),
+        this.props.indexKey
+      )
+
+      sortedData.forEach(row => {
+        if (!row[this.props.subRowsKey]) {
+          return
+        }
+        row[this.props.subRowsKey] = this.sortData(
+          row[this.props.subRowsKey],
+          sorted,
+          sortMethodsByColumnID
+        )
+      })
+
+      return sortedData
+    }
+
+    getMinRows () {
+      return _.getFirstDefined(this.props.minRows, this.getStateOrProp('pageSize'))
+    }
+
+    // User actions
+    onPageChange (page) {
+      const { onPageChange, collapseOnPageChange } = this.props
+
+      const newState = { page }
+      if (collapseOnPageChange) {
+        newState.expanded = {}
+      }
+      this.setStateWithData(newState, () => onPageChange && onPageChange(page))
+    }
+
+    onPageSizeChange (newPageSize) {
+      const { onPageSizeChange } = this.props
+      const { pageSize, page } = this.getResolvedState()
+
+      // Normalize the page to display
+      const currentRow = pageSize * page
+      const newPage = Math.floor(currentRow / newPageSize)
+
+      this.setStateWithData(
+        {
+          pageSize: newPageSize,
+          page: newPage,
+        },
+        () => onPageSizeChange && onPageSizeChange(newPageSize, newPage)
+      )
+    }
+
+    sortColumn (column, additive) {
+      const { sorted, skipNextSort, defaultSortDesc } = this.getResolvedState()
+
+      const firstSortDirection = Object.prototype.hasOwnProperty.call(column, 'defaultSortDesc')
+        ? column.defaultSortDesc
+        : defaultSortDesc
+      const secondSortDirection = !firstSortDirection
+
+      // we can't stop event propagation from the column resize move handlers
+      // attached to the document because of react's synthetic events
+      // so we have to prevent the sort function from actually sorting
+      // if we click on the column resize element within a header.
+      if (skipNextSort) {
+        this.setStateWithData({
+          skipNextSort: false,
+        })
+        return
+      }
+
+      const { onSortedChange } = this.props
+
+      let newSorted = _.clone(sorted || []).map(d => {
+        d.desc = _.isSortingDesc(d)
+        return d
+      })
+      if (!_.isArray(column)) {
+        // Single-Sort
+        const existingIndex = newSorted.findIndex(d => d.id === column.id)
+        if (existingIndex > -1) {
+          const existing = newSorted[existingIndex]
+          if (existing.desc === secondSortDirection) {
+            if (additive) {
+              newSorted.splice(existingIndex, 1)
+            } else {
+              existing.desc = firstSortDirection
+              newSorted = [existing]
+            }
+          } else {
+            existing.desc = secondSortDirection
+            if (!additive) {
+              newSorted = [existing]
+            }
+          }
+        } else if (additive) {
+          newSorted.push({
+            id: column.id,
+            desc: firstSortDirection,
+          })
+        } else {
+          newSorted = [
+            {
+              id: column.id,
+              desc: firstSortDirection,
+            },
+          ]
+        }
+      } else {
+        // Multi-Sort
+        const existingIndex = newSorted.findIndex(d => d.id === column[0].id)
+        // Existing Sorted Column
+        if (existingIndex > -1) {
+          const existing = newSorted[existingIndex]
+          if (existing.desc === secondSortDirection) {
+            if (additive) {
+              newSorted.splice(existingIndex, column.length)
+            } else {
+              column.forEach((d, i) => {
+                newSorted[existingIndex + i].desc = firstSortDirection
+              })
+            }
+          } else {
+            column.forEach((d, i) => {
+              newSorted[existingIndex + i].desc = secondSortDirection
+            })
+          }
+          if (!additive) {
+            newSorted = newSorted.slice(existingIndex, column.length)
+          }
+          // New Sort Column
+        } else if (additive) {
+          newSorted = newSorted.concat(
+            column.map(d => ({
+              id: d.id,
+              desc: firstSortDirection,
+            }))
+          )
+        } else {
+          newSorted = column.map(d => ({
+            id: d.id,
+            desc: firstSortDirection,
+          }))
+        }
+      }
+
+      this.setStateWithData(
+        {
+          page: (!sorted.length && newSorted.length) || !additive ? 0 : this.state.page,
+          sorted: newSorted,
+        },
+        () => onSortedChange && onSortedChange(newSorted, column, additive)
+      )
+    }
+
+    filterColumn (column, value) {
+      const { filtered } = this.getResolvedState()
+      const { onFilteredChange } = this.props
+
+      // Remove old filter first if it exists
+      const newFiltering = (filtered || []).filter(x => x.id !== column.id)
+
+      if (value !== '') {
+        newFiltering.push({
+          id: column.id,
+          value,
+        })
+      }
+
+      this.setStateWithData(
+        {
+          filtered: newFiltering,
+        },
+        () => onFilteredChange && onFilteredChange(newFiltering, column, value)
+      )
+    }
+
+    resizeColumnStart (event, column, isTouch) {
+      event.stopPropagation()
+      const parentWidth = event.target.parentElement.getBoundingClientRect().width
+
+      let pageX
+      if (isTouch) {
+        pageX = event.changedTouches[0].pageX
+      } else {
+        pageX = event.pageX
+      }
+
+      this.trapEvents = true
+      this.setStateWithData(
+        {
+          currentlyResizing: {
+            id: column.id,
+            startX: pageX,
+            parentWidth,
+          },
+        },
+        () => {
+          if (isTouch) {
+            document.addEventListener('touchmove', this.resizeColumnMoving)
+            document.addEventListener('touchcancel', this.resizeColumnEnd)
+            document.addEventListener('touchend', this.resizeColumnEnd)
+          } else {
+            document.addEventListener('mousemove', this.resizeColumnMoving)
+            document.addEventListener('mouseup', this.resizeColumnEnd)
+            document.addEventListener('mouseleave', this.resizeColumnEnd)
+          }
+        }
+      )
+    }
+
+    resizeColumnMoving (event) {
+      event.stopPropagation()
+      const { onResizedChange } = this.props
+      const { resized, currentlyResizing } = this.getResolvedState()
+
+      // Delete old value
+      const newResized = resized.filter(x => x.id !== currentlyResizing.id)
+
+      let pageX
+
+      if (event.type === 'touchmove') {
+        pageX = event.changedTouches[0].pageX
+      } else if (event.type === 'mousemove') {
+        pageX = event.pageX
+      }
+
+      // Set the min size to 10 to account for margin and border or else the
+      // group headers don't line up correctly
+      const newWidth = Math.max(
+        currentlyResizing.parentWidth + pageX - currentlyResizing.startX,
+        11
+      )
+
+      newResized.push({
+        id: currentlyResizing.id,
+        value: newWidth,
+      })
+
+      this.setStateWithData(
+        {
+          resized: newResized,
+        },
+        () => onResizedChange && onResizedChange(newResized, event)
+      )
+    }
+
+    resizeColumnEnd (event) {
+      event.stopPropagation()
+      const isTouch = event.type === 'touchend' || event.type === 'touchcancel'
+
+      if (isTouch) {
+        document.removeEventListener('touchmove', this.resizeColumnMoving)
+        document.removeEventListener('touchcancel', this.resizeColumnEnd)
+        document.removeEventListener('touchend', this.resizeColumnEnd)
+      }
+
+      // If its a touch event clear the mouse one's as well because sometimes
+      // the mouseDown event gets called as well, but the mouseUp event doesn't
+      document.removeEventListener('mousemove', this.resizeColumnMoving)
+      document.removeEventListener('mouseup', this.resizeColumnEnd)
+      document.removeEventListener('mouseleave', this.resizeColumnEnd)
+
+      // The touch events don't propagate up to the sorting's onMouseDown event so
+      // no need to prevent it from happening or else the first click after a touch
+      // event resize will not sort the column.
+      if (!isTouch) {
+        this.setStateWithData({
+          skipNextSort: true,
+          currentlyResizing: false,
+        })
+      }
+    }
+  }
@@ -1,34 +1,54 @@
-import React from 'react'
+import React, { Component } from 'react'
 import classnames from 'classnames'
 //
 // import _ from './utils'

-const defaultButton = (props) => (
-  <button {...props} className='-btn'>{props.children}</button>
+const defaultButton = props => (
+  <button type="button" {...props} className="-btn">
+    {props.children}
+  </button>
 )

-export default React.createClass({
-  getInitialState () {
-    return {
-      page: this.props.page
+export default class ReactTablePagination extends Component {
+  constructor (props) {
+    super()
+
+    this.getSafePage = this.getSafePage.bind(this)
+    this.changePage = this.changePage.bind(this)
+    this.applyPage = this.applyPage.bind(this)
+
+    this.state = {
+      page: props.page,
    }
-  },
+  }
+
  componentWillReceiveProps (nextProps) {
-    this.setState({page: nextProps.page})
-  },
+    this.setState({ page: nextProps.page })
+  }
+
  getSafePage (page) {
+    if (Number.isNaN(page)) {
+      page = this.props.page
+    }
    return Math.min(Math.max(page, 0), this.props.pages - 1)
-  },
+  }
+
  changePage (page) {
    page = this.getSafePage(page)
-    this.setState({page})
-    this.props.onPageChange(page)
-  },
+    this.setState({ page })
+    if (this.props.page !== page) {
+      this.props.onPageChange(page)
+    }
+  }
+
  applyPage (e) {
-    e && e.preventDefault()
+    if (e) {
+      e.preventDefault()
+    }
    const page = this.state.page
    this.changePage(page === '' ? this.props.page : page)
-  },
+  }
+
  render () {
    const {
      // Computed
@@ -44,17 +64,14 @@ export default React.createClass({
      onPageSizeChange,
      className,
      PreviousComponent = defaultButton,
-      NextComponent = defaultButton
+      NextComponent = defaultButton,
    } = this.props

    return (
-      <div
-        className={classnames(className, '-pagination')}
-        style={this.props.paginationStyle}
-      >
-        <div className='-previous'>
+      <div className={classnames(className, '-pagination')} style={this.props.style}>
+        <div className="-previous">
          <PreviousComponent
-            onClick={(e) => {
+            onClick={() => {
              if (!canPrevious) return
              this.changePage(page - 1)
            }}
@@ -63,52 +80,51 @@ export default React.createClass({
            {this.props.previousText}
          </PreviousComponent>
        </div>
-        <div className='-center'>
-          <span className='-pageInfo'>
-            {this.props.pageText} {showPageJump ? (
-              <form className='-pageJump'
-                onSubmit={this.applyPage}
-              >
+        <div className="-center">
+          <span className="-pageInfo">
+            {this.props.pageText}{' '}
+            {showPageJump ? (
+              <div className="-pageJump">
                <input
                  type={this.state.page === '' ? 'text' : 'number'}
                  onChange={e => {
                    const val = e.target.value
                    const page = val - 1
                    if (val === '') {
-                      return this.setState({page: val})
+                      return this.setState({ page: val })
                    }
-                    this.setState({page: this.getSafePage(page)})
+                    this.setState({ page: this.getSafePage(page) })
                  }}
                  value={this.state.page === '' ? '' : this.state.page + 1}
                  onBlur={this.applyPage}
+                  onKeyPress={e => {
+                    if (e.which === 13 || e.keyCode === 13) {
+                      this.applyPage()
+                    }
+                  }}
                />
-              </form>
+              </div>
            ) : (
-              <span className='-currentPage'>{page + 1}</span>
-            )} {this.props.ofText} <span className='-totalPages'>{pages}</span>
+              <span className="-currentPage">{page + 1}</span>
+            )}{' '}
+            {this.props.ofText} <span className="-totalPages">{pages || 1}</span>
          </span>
          {showPageSizeOptions && (
-            <span className='select-wrap -pageSizeOptions'>
-              <select
-                onChange={(e) => onPageSizeChange(Number(e.target.value))}
-                value={pageSize}
-              >
-                {pageSizeOptions.map((option, i) => {
-                  return (
-                    <option
-                      key={i}
-                      value={option}>
-                      {option} {this.props.rowsText}
-                    </option>
-                  )
-                })}
+            <span className="select-wrap -pageSizeOptions">
+              <select onChange={e => onPageSizeChange(Number(e.target.value))} value={pageSize}>
+                {pageSizeOptions.map((option, i) => (
+                  // eslint-disable-next-line react/no-array-index-key
+                  <option key={i} value={option}>
+                    {option} {this.props.rowsText}
+                  </option>
+                ))}
              </select>
            </span>
          )}
        </div>
-        <div className='-next'>
+        <div className="-next">
          <NextComponent
-            onClick={(e) => {
+            onClick={() => {
              if (!canNext) return
              this.changePage(page + 1)
            }}
@@ -120,4 +136,4 @@ export default React.createClass({
      </div>
    )
  }
-})
+}
@@ -0,0 +1,166 @@
+import PropTypes from 'prop-types'
+
+export default {
+  // General
+  data: PropTypes.any.isRequired,
+  loading: PropTypes.bool,
+  showPagination: PropTypes.bool,
+  showPaginationTop: PropTypes.bool,
+  showPaginationBottom: PropTypes.bool,
+  showPageSizeOptions: PropTypes.bool,
+  pageSizeOptions: PropTypes.array,
+  defaultPageSize: PropTypes.number,
+  showPageJump: PropTypes.bool,
+  collapseOnSortingChange: PropTypes.bool,
+  collapseOnPageChange: PropTypes.bool,
+  collapseOnDataChange: PropTypes.bool,
+  freezeWhenExpanded: PropTypes.bool,
+  sortable: PropTypes.bool,
+  resizable: PropTypes.bool,
+  filterable: PropTypes.bool,
+  defaultSortDesc: PropTypes.bool,
+  defaultSorted: PropTypes.array,
+  defaultFiltered: PropTypes.array,
+  defaultResized: PropTypes.array,
+  defaultExpanded: PropTypes.object,
+  defaultFilterMethod: PropTypes.func,
+  defaultSortMethod: PropTypes.func,
+
+  // Controlled State Callbacks
+  onPageChange: PropTypes.func,
+  onPageSizeChange: PropTypes.func,
+  onSortedChange: PropTypes.func,
+  onFilteredChange: PropTypes.func,
+  onResizedChange: PropTypes.func,
+  onExpandedChange: PropTypes.func,
+
+  // Pivoting
+  pivotBy: PropTypes.array,
+
+  // Key Constants
+  pivotValKey: PropTypes.string,
+  pivotIDKey: PropTypes.string,
+  subRowsKey: PropTypes.string,
+  aggregatedKey: PropTypes.string,
+  nestingLevelKey: PropTypes.string,
+  originalKey: PropTypes.string,
+  indexKey: PropTypes.string,
+  groupedByPivotKey: PropTypes.string,
+
+  // Server-side Callbacks
+  onFetchData: PropTypes.func,
+
+  // Classes
+  className: PropTypes.string,
+  style: PropTypes.object,
+
+  // Component decorators
+  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.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,
+
+      // Cells only
+      className: PropTypes.string,
+      style: PropTypes.object,
+      getProps: PropTypes.func,
+
+      // Pivot only
+      aggregate: PropTypes.func,
+
+      // 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,
+    })
+  ),
+
+  // Global Expander Column Defaults
+  expanderDefaults: PropTypes.shape({
+    sortable: PropTypes.bool,
+    resizable: PropTypes.bool,
+    filterable: PropTypes.bool,
+    width: PropTypes.number,
+  }),
+
+  pivotDefaults: PropTypes.object,
+
+  // Text
+  previousText: PropTypes.node,
+  nextText: PropTypes.node,
+  loadingText: PropTypes.node,
+  noDataText: PropTypes.node,
+  pageText: PropTypes.node,
+  ofText: PropTypes.node,
+  rowsText: PropTypes.node,
+
+  // Components
+  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]),
+  // this is a computed default generated using
+  PivotComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
+  // the ExpanderComponent and PivotValueComponent at run-time in methods.js
+  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]),
+}
@@ -6,16 +6,20 @@ export default {
  set,
  takeRight,
  last,
-  sortBy,
+  orderBy,
  range,
  remove,
  clone,
  getFirstDefined,
  sum,
  makeTemplateComponent,
-  prefixAll,
  groupBy,
-  isArray
+  isArray,
+  splitProps,
+  compactObject,
+  isSortingDesc,
+  normalizeComponent,
+  asPx,
 }

 function get (obj, path, def) {
@@ -26,7 +30,9 @@ function get (obj, path, def) {
  let val
  try {
    val = pathObj.reduce((current, pathPart) => current[pathPart], obj)
-  } catch (e) {}
+  } catch (e) {
+    // continue regardless of error
+  }
  return typeof val !== 'undefined' ? val : def
 }

@@ -55,33 +61,30 @@ function last (arr) {

 function range (n) {
  const arr = []
-  for (let i = 0; i < n; i++) {
+  for (let i = 0; i < n; i += 1) {
    arr.push(n)
  }
  return arr
 }

-function sortBy (arr, funcs, dirs) {
-  return arr.sort((a, b) => {
-    for (let i = 0; i < funcs.length; i++) {
+function orderBy (arr, funcs, dirs, indexKey) {
+  return arr.sort((rowA, rowB) => {
+    for (let i = 0; i < funcs.length; i += 1) {
      const comp = funcs[i]
-      const ca = comp(a)
-      const cb = comp(b)
      const desc = dirs[i] === false || dirs[i] === 'desc'
-      if (ca > cb) {
-        return desc ? -1 : 1
-      }
-      if (ca < cb) {
-        return desc ? 1 : -1
+      const sortInt = comp(rowA, rowB)
+      if (sortInt) {
+        return desc ? -sortInt : sortInt
      }
    }
-    return 0
+    // Use the row index for tie breakers
+    return dirs[0] ? rowA[indexKey] - rowB[indexKey] : rowB[indexKey] - rowA[indexKey]
  })
 }

 function remove (a, b) {
-  return a.filter(function (o, i) {
-    var r = b(o)
+  return a.filter((o, i) => {
+    const r = b(o)
    if (r) {
      a.splice(i, 1)
      return true
@@ -92,19 +95,21 @@ function remove (a, b) {

 function clone (a) {
  try {
-    return JSON.parse(JSON.stringify(a, (key, value) => {
-      if (typeof value === 'function') {
-        return value.toString()
-      }
-      return value
-    }))
+    return JSON.parse(
+      JSON.stringify(a, (key, value) => {
+        if (typeof value === 'function') {
+          return value.toString()
+        }
+        return value
+      })
+    )
  } catch (e) {
    return a
  }
 }

 function getFirstDefined (...args) {
-  for (var i = 0; i < args.length; i++) {
+  for (let i = 0; i < args.length; i += 1) {
    if (typeof args[i] !== 'undefined') {
      return args[i]
    }
@@ -112,35 +117,36 @@ function getFirstDefined (...args) {
 }

 function sum (arr) {
-  return arr.reduce((a, b) => {
-    return a + b
-  }, 0)
+  return arr.reduce((a, b) => a + b, 0)
 }

-function makeTemplateComponent (compClass) {
-  return ({children, className, ...rest}) => (
-    <div
-      className={classnames(compClass, className)}
-      {...rest}
-    >
+function makeTemplateComponent (compClass, displayName) {
+  if (!displayName) {
+    throw new Error('No displayName found for template component:', compClass)
+  }
+  const cmp = ({ children, className, ...rest }) => (
+    <div className={classnames(compClass, className)} {...rest}>
      {children}
    </div>
  )
-}
-
-function prefixAll (obj) {
-  return obj
+  cmp.displayName = displayName
+  return cmp
 }

 function groupBy (xs, key) {
  return xs.reduce((rv, x, i) => {
    const resKey = typeof key === 'function' ? key(x, i) : x[key]
-    rv[resKey] = rv[resKey] || []
+    rv[resKey] = isArray(rv[resKey]) ? rv[resKey] : []
    rv[resKey].push(x)
    return rv
  }, {})
 }

+function asPx (value) {
+  value = Number(value)
+  return Number.isNaN(value) ? null : `${value}px`
+}
+
 function isArray (a) {
  return Array.isArray(a)
 }
@@ -151,19 +157,60 @@ function isArray (a) {

 function makePathArray (obj) {
  return flattenDeep(obj)
-      .join('.')
-      .replace('[', '.')
-      .replace(']', '')
-      .split('.')
+    .join('.')
+    .replace(/\[/g, '.')
+    .replace(/\]/g, '')
+    .split('.')
 }

 function flattenDeep (arr, newArr = []) {
  if (!isArray(arr)) {
    newArr.push(arr)
  } else {
-    for (var i = 0; i < arr.length; i++) {
+    for (let i = 0; i < arr.length; i += 1) {
      flattenDeep(arr[i], newArr)
    }
  }
  return newArr
 }
+
+function splitProps ({ className, style, ...rest }) {
+  return {
+    className,
+    style,
+    rest: rest || {},
+  }
+}
+
+function compactObject (obj) {
+  const newObj = {}
+  if (obj) {
+    Object.keys(obj).map(key => {
+      if (
+        Object.prototype.hasOwnProperty.call(obj, key) &&
+        obj[key] !== undefined &&
+        typeof obj[key] !== 'undefined'
+      ) {
+        newObj[key] = obj[key]
+      }
+      return true
+    })
+  }
+  return newObj
+}
+
+function isSortingDesc (d) {
+  return !!(d.sort === 'desc' || d.desc === true || d.asc === false)
+}
+
+function normalizeComponent (Comp, params = {}, fallback = Comp) {
+  return typeof Comp === 'function' ? (
+    Object.getPrototypeOf(Comp).isReactComponent ? (
+      <Comp {...params} />
+    ) : (
+      Comp(params)
+    )
+  ) : (
+    fallback
+  )
+}
@@ -1,138 +0,0 @@
-import React from 'react'
-import _ from 'lodash'
-import namor from 'namor'
-
-import CodeHighlight from './components/codeHighlight'
-import ReactTable from '../lib/index'
-
-export default () => {
-  const data = _.map(_.range(1000000), d => {
-    return {
-      firstName: namor.generate({ words: 1, numLen: 0 }),
-      lastName: namor.generate({ words: 1, numLen: 0 }),
-      age: Math.floor(Math.random() * 30),
-      visits: Math.floor(Math.random() * 100)
-    }
-  })
-
-  const 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',
-      aggregate: vals => _.round(_.mean(vals)),
-      render: row => {
-        return <span>{row.aggregated ? `${row.value} (avg)` : row.value}</span>
-      }
-    }, {
-      header: 'Visits',
-      accessor: 'visits',
-      aggregate: vals => _.sum(vals)
-    }]
-  }]
-
-  return (
-    <div>
-      <div className='table-wrap'>
-        <ReactTable
-          data={data}
-          columns={columns}
-          defaultPageSize={10}
-          pivotBy={['firstName', 'lastName']}
-          SubComponent={(row) => {
-            return (
-              <div style={{padding: '20px'}}>
-                <em>You can put any component you want here, even another React Table!</em>
-                <br />
-                <br />
-                <ReactTable
-                  data={data}
-                  columns={columns}
-                  defaultPageSize={3}
-                  showPagination={false}
-                  SubComponent={(row) => {
-                    return (
-                      <div style={{padding: '20px'}}>
-                        <em>It even has access to the row data: </em>
-                        <CodeHighlight>{() => JSON.stringify(row, null, 2)}</CodeHighlight>
-                      </div>
-                    )
-                  }}
-                />
-              </div>
-            )
-          }}
-        />
-      </div>
-      <div style={{textAlign: 'center'}}>
-        <br />
-        <em>Tip: Hold shift when sorting to multi-sort!</em>
-      </div>
-      <CodeHighlight>{() => getCode()}</CodeHighlight>
-    </div>
-  )
-}
-
-function getCode () {
-  return `
-const 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'
-  }]
-}]
-
-export default (
-  <ReactTable
-    data={data}
-    columns={columns}
-    defaultPageSize={10}
-    pivotBy={['firstName', 'lastName']}
-    SubComponent={(row) => {
-      return (
-        <div style={{padding: '20px'}}>
-          <em>You can put any component you want here, even another React Table!</em>
-          <br />
-          <br />
-          <ReactTable
-            data={data}
-            columns={columns}
-            defaultPageSize={3}
-            showPagination={false}
-            SubComponent={(row) => {
-              return (
-                <div style={{padding: '20px'}}>
-                  <em>It even has access to the row data: </em>
-                  <CodeHighlight>{() => JSON.stringify(row, null, 2)}</CodeHighlight>
-                </div>
-              )
-            }}
-          />
-        </div>
-      )
-    }}
-  />
-)
-  `
-}
@@ -1,120 +0,0 @@
-import React from 'react'
-import _ from 'lodash'
-import namor from 'namor'
-
-import CodeHighlight from './components/codeHighlight'
-import ReactTable from '../lib/index'
-
-export default () => {
-  const data = _.map(_.range(10000), d => {
-    return {
-      firstName: namor.generate({ words: 1, numLen: 0 }),
-      lastName: namor.generate({ words: 1, numLen: 0 }),
-      age: Math.floor(Math.random() * 30),
-      visits: Math.floor(Math.random() * 100)
-    }
-  })
-
-  const 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',
-      aggregate: vals => _.round(_.mean(vals)),
-      render: row => {
-        return <span>{row.aggregated ? `${row.value} (avg)` : row.value}</span>
-      }
-    }, {
-      header: 'Visits',
-      accessor: 'visits',
-      aggregate: vals => _.sum(vals)
-    }]
-  }]
-
-  return (
-    <div>
-      <div className='table-wrap'>
-        <ReactTable
-          data={data}
-          columns={columns}
-          defaultPageSize={10}
-          pivotBy={['firstName', 'lastName']}
-          // expandedRows={{
-          //   2: true,
-          //   3: {
-          //     2: true
-          //   }
-          // }}
-        />
-      </div>
-      <div style={{textAlign: 'center'}}>
-        <br />
-        <em>Tip: Hold shift when sorting to multi-sort!</em>
-      </div>
-      <CodeHighlight>{() => getCode()}</CodeHighlight>
-    </div>
-  )
-}
-
-function getCode () {
-  return `
-const 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'
-  }]
-}]
-
-export default (
-  <ReactTable
-    data={data}
-    columns={columns}
-    defaultPageSize={10}
-    SubComponent={(row) => {
-      return (
-        <div style={{padding: '20px'}}>
-          <em>You can put any component you want here, even another React Table!</em>
-          <br />
-          <br />
-          <ReactTable
-            data={data}
-            columns={columns}
-            defaultPageSize={3}
-            showPagination={false}
-            SubComponent={(row) => {
-              return (
-                <div style={{padding: '20px'}}>
-                  <em>It even has access to the row data: </em>
-                  <CodeHighlight>{() => JSON.stringify(row, null, 2)}</CodeHighlight>
-                </div>
-              )
-            }}
-          />
-        </div>
-      )
-    }}
-  />
-)
-  `
-}
@@ -1,138 +0,0 @@
-import React from 'react'
-import _ from 'lodash'
-import namor from 'namor'
-
-import CodeHighlight from './components/codeHighlight'
-import ReactTable from '../lib/index'
-
-export default () => {
-  const data = _.map(_.range(1000), d => {
-    return {
-      firstName: namor.generate({ words: 1, numLen: 0 }),
-      lastName: namor.generate({ words: 1, numLen: 0 }),
-      age: Math.floor(Math.random() * 30),
-      visits: Math.floor(Math.random() * 100)
-    }
-  })
-
-  const 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',
-      aggregate: vals => _.round(_.mean(vals)),
-      render: row => {
-        return <span>{row.aggregated ? `${row.value} (avg)` : row.value}</span>
-      }
-    }, {
-      header: 'Visits',
-      accessor: 'visits',
-      aggregate: vals => _.sum(vals)
-    }]
-  }]
-
-  return (
-    <div>
-      <div className='table-wrap'>
-        <ReactTable
-          data={data}
-          columns={columns}
-          defaultPageSize={10}
-          pivotBy={['firstName', 'lastName']}
-          SubComponent={(row) => {
-            return (
-              <div style={{padding: '20px'}}>
-                <em>You can put any component you want here, even another React Table!</em>
-                <br />
-                <br />
-                <ReactTable
-                  data={data}
-                  columns={columns}
-                  defaultPageSize={3}
-                  showPagination={false}
-                  SubComponent={(row) => {
-                    return (
-                      <div style={{padding: '20px'}}>
-                        <em>It even has access to the row data: </em>
-                        <CodeHighlight>{() => JSON.stringify(row, null, 2)}</CodeHighlight>
-                      </div>
-                    )
-                  }}
-                />
-              </div>
-            )
-          }}
-        />
-      </div>
-      <div style={{textAlign: 'center'}}>
-        <br />
-        <em>Tip: Hold shift when sorting to multi-sort!</em>
-      </div>
-      <CodeHighlight>{() => getCode()}</CodeHighlight>
-    </div>
-  )
-}
-
-function getCode () {
-  return `
-const 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'
-  }]
-}]
-
-export default (
-  <ReactTable
-    data={data}
-    columns={columns}
-    defaultPageSize={10}
-    pivotBy={['firstName', 'lastName']}
-    SubComponent={(row) => {
-      return (
-        <div style={{padding: '20px'}}>
-          <em>You can put any component you want here, even another React Table!</em>
-          <br />
-          <br />
-          <ReactTable
-            data={data}
-            columns={columns}
-            defaultPageSize={3}
-            showPagination={false}
-            SubComponent={(row) => {
-              return (
-                <div style={{padding: '20px'}}>
-                  <em>It even has access to the row data: </em>
-                  <CodeHighlight>{() => JSON.stringify(row, null, 2)}</CodeHighlight>
-                </div>
-              )
-            }}
-          />
-        </div>
-      )
-    }}
-  />
-)
-  `
-}
@@ -1,175 +0,0 @@
-import React from 'react'
-import _ from 'lodash'
-import namor from 'namor'
-
-import CodeHighlight from './components/codeHighlight'
-import ReactTable from '../lib/index'
-
-const rawData = _.map(_.range(3424), d => {
-  return {
-    firstName: namor.generate({ words: 1, numLen: 0 }),
-    lastName: namor.generate({ words: 1, numLen: 0 }),
-    age: Math.floor(Math.random() * 30)
-  }
-})
-
-// Now let's mock the server.  It's job is simple: use the table model to sort and return the page data
-const requestData = (pageSize, page, sorting) => {
-  return new Promise((resolve, reject) => {
-    // On the server, you'll likely use SQL or noSQL or some other query language to do this.
-    // For this mock, we'll just use lodash
-    const sortedData = _.orderBy(rawData, sorting.map(sort => {
-      return row => {
-        if (row[sort.id] === null || row[sort.id] === undefined) {
-          return -Infinity
-        }
-        return typeof row[sort.id] === 'string' ? row[sort.id].toLowerCase() : row[sort.id]
-      }
-    }), sorting.map(d => d.asc ? 'asc' : 'desc'))
-
-    // Be sure to send back the rows to be displayed and any other pertinent information, like how many pages there are total.
-    const res = {
-      rows: sortedData.slice(pageSize * page, (pageSize * page) + pageSize),
-      pages: Math.ceil(rawData.length / pageSize)
-    }
-
-    // Here we'll simulate a server response with 500ms of delay.
-    setTimeout(() => resolve(res), 500)
-  })
-}
-
-const ServerSide = React.createClass({
-  getInitialState () {
-    // To handle our data server-side, we need a few things in the state to help us out:
-    return {
-      data: [],
-      pages: null,
-      loading: true
-    }
-  },
-  fetchData (state, instance) {
-    console.log(state, instance)
-    // Whenever the table model changes, or the user sorts or changes pages, this method gets called and passed the current table model.
-    // You can set the `loading` prop of the table to true to use the built-in one or show you're own loading bar if you want.
-    this.setState({loading: true})
-    // Request the data however you want.  Here, we'll use our mocked service we created earlier
-    requestData(state.pageSize, state.page, state.sorting)
-      .then((res) => {
-        // Now just get the rows of data to your React Table (and update anything else like total pages or loading)
-        this.setState({
-          data: res.rows,
-          pages: res.pages,
-          loading: false
-        })
-      })
-  },
-  render () {
-    return (
-      <div>
-        <div className='table-wrap'>
-          <ReactTable
-            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
-          />
-        </div>
-        <div style={{textAlign: 'center'}}>
-          <br />
-          <em>Tip: Hold shift when sorting to multi-sort!</em>
-        </div>
-        <CodeHighlight>{() => getCode()}</CodeHighlight>
-      </div>
-    )
-  }
-})
-
-export default () => (
-  <ServerSide />
-)
-
-function getCode () {
-  return `
-import ReactTable from 'react-table'
-import Axios from 'axios'
-
-export default React.createClass({
-  getInitialState () {
-    // To handle our data server-side, we need to keep track of our table state
-    return {
-      data: [],
-      pages: null,
-      loading: true
-    }
-  },
-  fetchData (state, instance) {
-    // Whenever the table model changes (sorting, pagination, etc), this method gets called and passed the current table model.
-    // You can set the 'loading' prop of the table to true to use the built-in loading notice, or show you're own loading bar if you want.
-    this.setState({loading: true})
-    // Request the data from a server however you want! Be sure to send the bits of the table model that it may neeed.
-    Axios.post('mysite.com/data', {
-      pageSize: state.pageSize,
-      page: state.page,
-      sorting: state.sorting
-    })
-      .then((res) => {
-        // Now update your state!
-        this.setState({
-          data: res.rows,
-          pages: res.pages,
-          loading: false
-        })
-      })
-  },
-  render () {
-    const 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'
-      }]
-    }]
-
-    return (
-      <ReactTable
-        columns={columns}
-        manual // This forces table not to paginate or sort automatically, so we can handle things server-side
-        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
-      />
-    )
-  }
-})
-  `
-}
@@ -1,85 +0,0 @@
-import React from 'react'
-import _ from 'lodash'
-import namor from 'namor'
-
-import CodeHighlight from './components/codeHighlight'
-import ReactTable from '../lib/index'
-
-export default () => {
-  const data = _.map(_.range(5553), d => {
-    return {
-      firstName: namor.generate({ words: 1, numLen: 0 }),
-      lastName: namor.generate({ words: 1, numLen: 0 }),
-      age: Math.floor(Math.random() * 30)
-    }
-  })
-
-  const 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'
-    }]
-  }]
-
-  return (
-    <div>
-      <div className='table-wrap'>
-        <ReactTable
-          data={data}
-          columns={columns}
-          defaultPageSize={10}
-        />
-      </div>
-      <div style={{textAlign: 'center'}}>
-        <br />
-        <em>Tip: Hold shift when sorting to multi-sort!</em>
-      </div>
-      <CodeHighlight>{() => getCode()}</CodeHighlight>
-    </div>
-  )
-}
-
-function getCode () {
-  return `
-import ReactTable from 'react-table'
-
-// Create some column definitions
-const 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'
-  }]
-}]
-
-// Display your table!
-return (
-  <ReactTable
-    data={data}
-    columns={columns}
-    defaultPageSize={10}
-  />
-)
-  `
-}
@@ -1,127 +0,0 @@
-import React from 'react'
-import _ from 'lodash'
-import namor from 'namor'
-
-import CodeHighlight from './components/codeHighlight'
-import ReactTable from '../lib/index'
-
-export default () => {
-  const data = _.map(_.range(5553), d => {
-    return {
-      firstName: namor.generate({ words: 1, numLen: 0 }),
-      lastName: namor.generate({ words: 1, numLen: 0 }),
-      age: Math.floor(Math.random() * 30)
-    }
-  })
-
-  const 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'
-    }]
-  }]
-
-  return (
-    <div>
-      <div className='table-wrap'>
-        <ReactTable
-          data={data}
-          columns={columns}
-          defaultPageSize={10}
-          SubComponent={(row) => {
-            return (
-              <div style={{padding: '20px'}}>
-                <em>You can put any component you want here, even another React Table!</em>
-                <br />
-                <br />
-                <ReactTable
-                  data={data}
-                  columns={columns}
-                  defaultPageSize={3}
-                  showPagination={false}
-                  SubComponent={(row) => {
-                    return (
-                      <div style={{padding: '20px'}}>
-                        <em>It even has access to the row data: </em>
-                        <CodeHighlight>{() => JSON.stringify(row, null, 2)}</CodeHighlight>
-                      </div>
-                    )
-                  }}
-                />
-              </div>
-            )
-          }}
-        />
-      </div>
-      <div style={{textAlign: 'center'}}>
-        <br />
-        <em>Tip: Hold shift when sorting to multi-sort!</em>
-      </div>
-      <CodeHighlight>{() => getCode()}</CodeHighlight>
-    </div>
-  )
-}
-
-function getCode () {
-  return `
-const 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'
-  }]
-}]
-
-export default (
-  <ReactTable
-    data={data}
-    columns={columns}
-    defaultPageSize={10}
-    SubComponent={(row) => {
-      return (
-        <div style={{padding: '20px'}}>
-          <em>You can put any component you want here, even another React Table!</em>
-          <br />
-          <br />
-          <ReactTable
-            data={data}
-            columns={columns}
-            defaultPageSize={3}
-            showPagination={false}
-            SubComponent={(row) => {
-              return (
-                <div style={{padding: '20px'}}>
-                  <em>It even has access to the row data: </em>
-                  <CodeHighlight>{() => JSON.stringify(row, null, 2)}</CodeHighlight>
-                </div>
-              )
-            }}
-          />
-        </div>
-      )
-    }}
-  />
-)
-  `
-}
@@ -1,14 +0,0 @@
-import React from 'react'
-import banner from '../../media/Banner.png'
-
-export default () => (
-  <div>
-    <div style={{textAlign: 'center'}}>
-      <a href='https://github.com/tannerlinsley/react-table' target='_blank'>
-        <img src={banner} className='logo' />
-      </a>
-      <br />
-      <br />
-    </div>
-  </div>
-)
@@ -1,21 +0,0 @@
-import React from 'react'
-import '../utils/prism'
-
-export default React.createClass({
-  render () {
-    const { language, children } = this.props
-    return (
-      <pre>
-        <code className={'language-' + (language || 'jsx')}>
-          {children()}
-        </code>
-      </pre>
-    )
-  },
-  componentDidMount () {
-    window.Prism.highlightAll()
-  },
-  componentDidUpdate () {
-    window.Prism.highlightAll()
-  }
-})
@@ -1,8 +0,0 @@
-{
-  "name": "react-table",
-  "root": "storybook-static",
-  "routes": [{
-    "src": "/**",
-    "dest": "index.html"
-  }]
-}