fixes issue #564 - IE not displaying rows

We have found that with longer documentation files, the position of the sponsor link is more effective in helping fund the project when it's higher in the readme.

.eslintrc.js

@@ -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 }]
+  }
+}

.gitignore

@@ -1,5 +1,8 @@
 node_modules/
 lib/
+docs/build
 react-table.js
 react-table.css
 *.log
+.idea
+.DS_Store

.storybook/CNAME

@@ -1 +0,0 @@
-react-table.js.org

.storybook/config.js

@@ -1,52 +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 CellRenderers from '../stories/CellRenderers.js'
-import DefaultSorting from '../stories/DefaultSorting.js'
-import CustomWidths from '../stories/CustomWidths.js'
-import CustomComponentProps from '../stories/CustomComponentProps.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 OneHundredKRows from '../stories/OneHundredKRows.js'
-import FunctionalRendering from '../stories/FunctionalRendering.js'
-import CustomExpanderPosition from '../stories/CustomExpanderPosition.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('Simple Table', Simple)
-    .add('Cell Renderers & Custom Components', CellRenderers)
-    .add('Default Sorting', DefaultSorting)
-    .add('Custom Column Widths', CustomWidths)
-    .add('Custom Component Props', CustomComponentProps)
-    .add('Server-side Data', ServerSide)
-    .add('Sub Components', SubComponents)
-    .add('Pivoting & Aggregation', Pivoting)
-    .add('Pivoting & Aggregation w/ Sub Components', PivotingSubComponents)
-    .add('100k Rows w/ Pivoting & Sub Components', OneHundredKRows)
-    .add('Functional Rendering', FunctionalRendering)
-    .add('Custom Expander Position', CustomExpanderPosition)
-}, module)

.storybook/fonts.css

@@ -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;
-}

.storybook/layout.css

@@ -1,3 +0,0 @@
-body{
-	padding: 20px;
-}

.storybook/reset.css

@@ -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;
-}

.storybook/webpack.config.js

@@ -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
-}

CHANGELOG.md

@@ -0,0 +1,57 @@
+## 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 ` `
+
+## 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.

ISSUE_TEMPLATE.md

@@ -0,0 +1,14 @@
+## 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

README.md

@@ -1,16 +1,12 @@
-<div align="center">
-  <a href="https://github.com/tannerlinsley/react-table" target="\_parent"><img src="https://github.com/tannerlinsley/react-table/raw/master/media/Banner.png" alt="React Table Logo" style="width:450px;"/></a>
-  <br />
-  <br />
-
+<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>
 
 # React Table
 `react-table` is a **lightweight, fast and extendable datagrid** built for React
 
-
-<a href="https://travis-ci.org/tannerlinsley/react-table" target="\_parent">
-  <img alt="" src="https://travis-ci.org/tannerlinsley/react-table.svg?branch=master" />
+<a href="https://travis-ci.org/react-tools/react-table" target="\_parent">
+  <img alt="" src="https://travis-ci.org/react-tools/react-table.svg?branch=master" />
 </a>
 <a href="https://npmjs.com/package/react-table" target="\_parent">
   <img alt="" src="https://img.shields.io/npm/dm/react-table.svg" />
@@ -18,24 +14,39 @@
 <a href="https://react-chat-signup.herokuapp.com/" target="\_parent">
   <img alt="" src="https://img.shields.io/badge/slack-react--chat-blue.svg" />
 </a>
-<a href="https://github.com/tannerlinsley/react-table" target="\_parent">
-  <img alt="" src="https://img.shields.io/github/stars/tannerlinsley/react-table.svg?style=social&label=Star" />
+<a href="https://github.com/react-tools/react-table" target="\_parent">
+  <img alt="" src="https://img.shields.io/github/stars/react-tools/react-table.svg?style=social&label=Star" />
 </a>
 <a href="https://twitter.com/tannerlinsley" target="\_parent">
   <img alt="" src="https://img.shields.io/twitter/follow/tannerlinsley.svg?style=social&label=Follow" />
 </a>
+<a href="https://cash.me/$tannerlinsley" target="\_parent">
+  <img alt="" src="https://img.shields.io/badge/%24-Donate-brightgreen.svg" />
+</a>
+
+<br />
+<br />
+
+[![Sponsor](https://app.codesponsor.io/embed/zpmS8V9r31sBSCeVzP7Wm6Sr/react-tools/react-table.svg)](https://app.codesponsor.io/link/zpmS8V9r31sBSCeVzP7Wm6Sr/react-tools/react-table)
 
 ## Features
-
-- Lightweight at 7kb (and just 2kb more for styles)
-- Fully customizable JSX templating
-- Supports both Client-side & Server-side pagination and multi-sorting
-- Column Pivoting & Aggregation
+- Lightweight at 11kb (and just 2kb more for styles)
+- Fully customizable (JSX, templates, state, styles, callbacks)
+- Client-side & Server-side pagination
+- Multi-sort
+- Filters
+- Pivoting & Aggregation
 - Minimal design & easily themeable
 - Fully controllable via optional props and callbacks
 - <a href="https://medium.com/@tannerlinsley/why-i-wrote-react-table-and-the-problems-it-has-solved-for-nozzle-others-445c4e93d4a8#.axza4ixba" target="\_parent">"Why I wrote React Table and the problems it has solved for Nozzle.io</a> by Tanner Linsley
 
-## <a href="http://react-table.js.org/?selectedKind=2.%20Demos&selectedStory=Client-side%20Data&full=0&down=0&left=1&panelRight=0&downPanel=kadirahq%2Fstorybook-addon-actions%2Factions-panel" target="\_parent">Demo</a>
+## [Demos and examples](http://react-table.js.org/#/story/simple-table)
+
+## Versions
+- This documentation is for version 6 of react-table.
+- [View the Changelog](https://github.com/react-tools/react-table/blob/master/CHANGELOG.md)
+- Previous versions:
+  - [5.x.x Readme](https://github.com/react-tools/react-table/blob/ad7d31cd3978eb45da7c6194dbab93c1e9a8594d/README.md)
 
 ## Table of Contents
 - [Installation](#installation)
@@ -44,15 +55,16 @@
 - [Props](#props)
 - [Columns](#columns)
 - [Column Header Groups](#column-header-groups)
-- [Custom Cell & Header Rendering](#custom-cell--and-header-rendering)
+- [Custom Cell and Header and Footer Rendering](#custom-cell-header-and-footer-rendering)
 - [Styles](#styles)
 - [Custom Props](#custom-props)
-- [Pivoting & Aggregation](#pivoting--aggregation)
-- [Sub Tables & Sub Components](#sub-tables--sub-components)
+- [Pivoting and Aggregation](#pivoting-and-aggregation)
+- [Sub Tables and Sub Components](#sub-tables-and-sub-components)
 - [Server-side Data](#server-side-data)
 - [Fully Controlled Component](#fully-controlled-component)
 - [Functional Rendering](#functional-rendering)
 - [Multi-Sort](#multi-sort)
+- [Filtering](#filtering)
 - [Component Overrides](#component-overrides)
 - [Contributing](#contributing)
 - [Scripts](#scripts)
@@ -62,8 +74,6 @@
 ## Installation
 1. Install React Table as a dependency
 ```bash
-$ npm install react-table
-# or
 $ yarn add react-table
 ```
 2. Import the `react-table` module
@@ -73,49 +83,64 @@ import ReactTable from 'react-table'
 // ES5
 var ReactTable = require('react-table').default
 ```
-3. Import styles by including `react-table.css` anywhere on the page
+3. Import styles by including `react-table.css`
 ```javascript
 // JS (Webpack)
 import 'react-table/react-table.css'
-// html
+// Old-school
 <link rel="stylesheet" href="node_modules/react-table/react-table.css">
 ```
+##### CDN
+```html
+  <!-- CSS -->
+  <link rel="stylesheet" href="https://unpkg.com/react-table@latest/react-table.css">
+
+  <!-- JS -->
+  <script src="https://unpkg.com/react-table@latest/react-table.js"></script>
+
+  <script>
+    var ReactTable = window.ReactTable.default
+  </script>
+```
 
 
 ## Example
 ```javascript
 import ReactTable from 'react-table'
 
-const data = [{
-  name: 'Tanner Linsley',
-  age: 26,
-  friend: {
-    name: 'Jason Maurer',
-    age: 23,
-  }
-},{
-  ...
-}]
+render() {
+  const data = [{
+    name: 'Tanner Linsley',
+    age: 26,
+    friend: {
+      name: 'Jason Maurer',
+      age: 23,
+    }
+  },{
+    ...
+  }]
 
-const columns = [{
-  header: 'Name',
-  accessor: 'name' // String-based value accessors !
-}, {
-  header: 'Age',
-  accessor: 'age',
-  render: props => <span className='number'>props.value</span> // Custom cell components!
-}, {
-  header: 'Friend Name',
-  accessor: d => d.friend.name // Custom value accessors!
-}, {
-  header: props => <span>Friend Age</span>, // Custom header components!
-  accessor: 'friend.age'
-}]
+  const columns = [{
+    Header: 'Name',
+    accessor: 'name' // String-based value accessors!
+  }, {
+    Header: 'Age',
+    accessor: 'age',
+    Cell: props => <span className='number'>{props.value}</span> // Custom cell components!
+  }, {
+    id: 'friendName', // Required because our accessor is not a string
+    Header: 'Friend Name',
+    accessor: d => d.friend.name // Custom value accessors!
+  }, {
+    Header: props => <span>Friend Age</span>, // Custom header components!
+    accessor: 'friend.age'
+  }]
 
-<ReactTable
-  data={data}
-  columns={columns}
-/>
+  <ReactTable
+    data={data}
+    columns={columns}
+  />
+}
 ```
 
 ## Data
@@ -130,38 +155,79 @@ These are all of the available props (and their default values) for the main `<R
   data: [],
   loading: false,
   showPagination: true,
+  showPaginationTop: false,
+  showPaginationBottom: true
   showPageSizeOptions: true,
   pageSizeOptions: [5, 10, 20, 25, 50, 100],
   defaultPageSize: 20,
+  minRows: undefined,
   showPageJump: true,
-  expanderColumnWidth: 35,
+  collapseOnSortingChange: true,
+  collapseOnPageChange: true,
+  collapseOnDataChange: true,
+  freezeWhenExpanded: false,
+  sortable: true,
+  resizable: true,
+  filterable: false,
+  defaultSortDesc: false,
+  defaultSorted: [],
+  defaultFiltered: [],
+  defaultResized: [],
+  defaultExpanded: {},
+  defaultFilterMethod: (filter, row, column) => {
+    const id = filter.pivotId || filter.id
+    return row[id] !== undefined ? String(row[id]).startsWith(filter.value) : true
+  },
+  defaultSortMethod: (a, b) => {
+    // force null and undefined to the bottom
+    a = (a === null || a === undefined) ? -Infinity : a
+    b = (b === null || b === undefined) ? -Infinity : b
+    // force any string values to lowercase
+    a = a === 'string' ? a.toLowerCase() : a
+    b = 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
+  },
+  PadRowComponent: () => <span>&nbsp;</span>, // the content rendered inside of a padding row
 
   // Controlled State Overrides (see Fully Controlled Component section)
   page: undefined,
   pageSize: undefined,
-  sorting: undefined
+  sorted: [],
+  filtered: [],
+  resized: [],
+  expanded: {},
 
   // Controlled State Callbacks
-  onExpandSubComponent: undefined,
   onPageChange: undefined,
   onPageSizeChange: undefined,
-  onSortingChange: undefined,
+  onSortedChange: undefined,
+  onFilteredChange: undefined,
+  onResizedChange: undefined,
+  onExpandedChange: undefined,
 
   // Pivoting
   pivotBy: undefined,
-  pivotColumnWidth: 200,
+
+  // Key Constants
   pivotValKey: '_pivotVal',
   pivotIDKey: '_pivotID',
   subRowsKey: '_subRows',
+  aggregatedKey: '_aggregated',
+  nestingLevelKey: '_nestingLevel',
+  originalKey: '_original',
+  indexKey: '_index',
+  groupedByPivotKey: '_groupedByPivot',
 
-  // Pivoting State Overrides (see Fully Controlled Component section)
-  expandedRows: {},
-
-  // Pivoting State Callbacks
-  onExpandRow: undefined,
-
-  // General Callbacks
-  onChange: () => null,
+  // Server-side callbacks
+  onFetchData: () => null,
 
   // Classes
   className: '',
@@ -176,35 +242,73 @@ These are all of the available props (and their default values) for the main `<R
   getTheadProps: () => ({}),
   getTheadTrProps: () => ({}),
   getTheadThProps: () => ({}),
+  getTheadFilterProps: () => ({}),
+  getTheadFilterTrProps: () => ({}),
+  getTheadFilterThProps: () => ({}),
   getTbodyProps: () => ({}),
   getTrGroupProps: () => ({}),
   getTrProps: () => ({}),
   getThProps: () => ({}),
   getTdProps: () => ({}),
+  getTfootProps: () => ({}),
+  getTfootTrProps: () => ({}),
+  getTfootThProps: () => ({}),
   getPaginationProps: () => ({}),
   getLoadingProps: () => ({}),
+  getNoDataProps: () => ({}),
+  getResizerProps: () => ({}),
 
   // Global Column Defaults
   column: {
-    sortable: true,
+    // Renderers
+    Cell: undefined,
+    Header: undefined,
+    Footer: undefined,
+    Aggregated: undefined,
+    Pivot: undefined,
+    PivotValue: undefined,
+    Expander: undefined,
+    Filter: undefined,
+    // Standard options
+    sortable: undefined, // use table default
+    resizable: undefined, // use table default
+    filterable: undefined, // use table default
     show: true,
     minWidth: 100,
     // Cells only
-    render: undefined,
     className: '',
     style: {},
     getProps: () => ({}),
     // Headers only
-    header: undefined,
     headerClassName: '',
     headerStyle: {},
     getHeaderProps: () => ({})
+    // Footers only
+    footerClassName: '',
+    footerStyle: {},
+    getFooterProps: () => ({}),
+    filterAll: false,
+    filterMethod: undefined,
+    sortMethod: undefined,
+    defaultSortDesc: undefined,
   },
 
+  // Global Expander Column Defaults
+  expanderDefaults: {
+    sortable: false,
+    resizable: false,
+    filterable: false,
+    width: 35
+  },
+
+  // Global Pivot Column Defaults
+  pivotDefaults: {},
+
   // Text
   previousText: 'Previous',
   nextText: 'Next',
   loadingText: 'Loading...',
+  noDataText: 'No rows found',
   pageText: 'Page',
   ofText: 'of',
   rowsText: 'rows',
@@ -238,64 +342,161 @@ Or just define them as props
 
 ```javascript
 [{
+  // Renderers - For more information, see "Renderers" section below
+  Cell: JSX | String | Function // Used to render a standard cell, defaults to the accessed value
+  Header: JSX | String | Function // Used to render the header of a column or column group
+  Footer: JSX | String | Function // Used to render the footer of a column
+  Filter: JSX | cellInfo => ( // Used to render the filter UI of a filter-enabled column
+    <select onChange={event => onFiltersChange(event.target.value)} value={filter ? filter.value : ''}></select>
+    // The value passed to onFiltersChange will be the value passed to filter.value of the filterMethod
+  )
+  Aggregated: JSX | String | Function // Used to render aggregated cells. Defaults to a comma separated list of values.
+  Pivot: JSX | String | Function | cellInfo => ( // Used to render a pivoted cell
+    <span>
+      <Expander/><PivotValue /> // By default, will utilize the the PivotValue and Expander components at run time
+    </span>
+  ),
+  PivotValue: JSX | String | Function // Used to render the value inside of a Pivot cell
+  Expander: JSX | String | Function // Used to render the expander in both Pivot and Expander cells
+
   // General
-  accessor: 'propertyName' or Accessor eg. (row) => row.propertyName,
+  accessor: 'propertyName', // or Accessor eg. (row) => row.propertyName (see "Accessors" section for more details)
   id: 'myProperty', // Conditional - A unique ID is required if the accessor is not a string or if you would like to override the column name used in server-side calls
-  sortable: true,
-  sort: 'asc' or 'desc', // used to determine the column sorting on init
+  sortable: boolean, // Overrides the table option
+  resizable: boolean, // Overrides the table option
+  filterable: boolean, // Overrides the table option
   show: true, // can be used to hide a column
   width: undefined, // A hardcoded width for the column. This overrides both min and max width options
-  minWidth: 100 // A minimum width for this column. If there is extra room, column will flex to fill available space (up to the max-width, if set)
-  maxWidth: undefined // A maximum width for this column.
+  minWidth: 100, // A minimum width for this column. If there is extra room, column will flex to fill available space (up to the max-width, if set)
+  maxWidth: undefined, // A maximum width for this column.
 
   // Special
-  expander: false // This option will override all data-related options and designates the column to be used
-  // for pivoting and sub-component expansion
+  pivot: false,
+  // Turns this column into a special column for specifying pivot position in your column definitions.
+  // The `pivotDefaults` options will be applied on top of this column's options.
+  // It will also let you specify rendering of the header (and header group if this special column is placed in the `columns` option of another column)
+  expander: false,
+  // Turns this column into a special column for specifying expander position and options in your column definitions.
+  // The `expanderDefaults` options will be applied on top of this column's options.
+  // It will also let you specify rendering of the header (and header group if this special column is placed in the `columns` option of another column) and
+  // the rendering of the expander itself via the `Expander` property
 
   // Cell Options
   className: '', // Set the classname of the `td` element of the column
   style: {}, // Set the style of the `td` element of the column
-  render: JSX eg. (rowInfo: {value, rowValues, row, index, viewIndex}) => <span>{value}</span>, // Provide a JSX element or stateless function to render whatever you want as the column's cell with access to the entire row
-    // value == the accessed value of the column
-    // rowValues == an object of all of the accessed values for the row
-    // row == the original row of data supplied to the table
-    // index == the original index of the data supplied to the table
-    // viewIndex == the index of the row in the current page
-
   // Header & HeaderGroup Options
-  header: 'Header Name' or JSX eg. ({data, column}) => <div>Header Name</div>,
   headerClassName: '', // Set the classname of the `th` element of the column
   headerStyle: {}, // Set the style of the `th` element of the column
+  getHeaderProps: (state, rowInfo, column, instance) => ({}), // a function that returns props to decorate the `th` element of the column
 
   // Header Groups only
-  columns: [...] // See Header Groups section below
+  columns: [...], // See Header Groups section below
 
+  // Footer
+  footerClassName: '', // Set the classname of the `td` element of the column's footer
+  footerStyle: {}, // Set the style of the `td` element of the column's footer
+  getFooterProps: (state, rowInfo, column, instance) => ({}), // A function that returns props to decorate the `td` element of the column's footer
+
+  // Filtering
+  filterMethod: (filter, row || rows, column) => {return true}, // A function returning a boolean that specifies the filtering logic for the column
+    // 'filter' == an object specifying which filter is being applied. Format: {id: [the filter column's id], value: [the value the user typed in the filter field], pivotId: [if filtering on a pivot column, the pivotId will be set to the pivot column's id and the `id` field will be set to the top level pivoting column]}
+    // 'row' || 'rows' == the row (or rows, if filterAll is set to true) of data supplied to the table
+    // 'column' == the column that the filter is on
+  filterAll: false
 }]
 ```
 
+## Renderers
+React Table supports very flexible renderers for just about everything:
+- `Cell` - Renders a standard cell
+- `Header` - Renders a column header or column group header
+- `Footer` - Renders a column footer
+- `Filter` - Renders a column's filter UI
+- `Aggregated` - Renders an aggregated cell
+- `Pivot` - Renders a pivoted cell (by default, will utilize `Expander` and `PivotValue` renderers)
+- `PivotValue` - Renders the value inside a `Pivot` renderer
+- `Expander` - Renders the Expander used in both the default `Pivot` renderer and any expander-designated column
+
+Any of these renderers can be one of the following:
+- A React Class
+- JSX or any rendered react component
+- Stateless functional component
+- Function that returns any primitive
+
+All of these formats receive the following props:
+```javascript
+{
+  // Row-level props
+  row: Object, // the materialized row of data
+  original: , // the original row of data
+  index: '', // the index of the row in the original arra
+  viewIndex: '', // the index of the row relative to the current view
+  level: '', // the nesting level of this row
+  nestingPath: '', // the nesting path of this row
+  aggregated: '', // true if this row's values were aggregated
+  groupedByPivot: '', // true if this row was produced by a pivot
+  subRows: '', // any sub rows defined by the `subRowKey` prop
+
+  // Cells-level props
+  isExpanded: '', // true if this row is expanded
+  value: '', // the materialized value of this cell
+  resized: '', // the resize information for this cell's column
+  show: '', // true if the column is visible
+  width: '', // the resolved width of this cell
+  maxWidth: '', // the resolved maxWidth of this cell
+  tdProps: '', // the resolved tdProps from `getTdProps` for this cell
+  columnProps: '', // the resolved column props from 'getProps' for this cell's column
+  classes: '', // the resolved array of classes for this cell
+  styles: '' // the resolved styles for this cell
+}
+```
+
+## Accessors
+Accessors are functions that return the value to populate the row's value for the column.
+This lets the render function not have to worry about accessing the correct data, the value is automatically populated in it's props.
+
+If a `string` or `array` is passed the default accessor is used.
+The default accessor will parse the input into an array and recursively flatten it.
+Any values that contain a dot (`.`) will be split.
+Any values that contain bracket (`[]`) will be split.
+This array is then used as the path to the value to return.
+
+("$" is the placeholder value that would be returned by the default accessor)
+
+| value        | path            | data                   |
+|--------------|-----------------|------------------------|
+| "a"          | ["a"]           | {"a": $}               |
+| "a.b"        | ["a", "b"]      | {"a": {"b": $}}        |
+| "a[0]"       | ["a", "0"]      | {"a": [$]}             |
+| ["a.b", "c"] | ["a", "b", "c"] | {"a": {"b": {"c": $}}} |
+
+*NOTE*
+If your data has a field/key with a dot (`.`) you will need to supply a custom accessor.
+
+
 ## Column Header Groups
 To group columns with another header column, just nest your columns in a header column.  Header columns utilize the same header properties as regular columns.
 ```javascript
 const columns = [{
-  header: 'Favorites',
+  Header: 'Favorites',
   headerClassName: 'my-favorites-column-header-group'
   columns: [{
-    header: 'Color',
+    Header: 'Color',
     accessor: 'favorites.color'
   }, {
-    header: 'Food',
+    Header: 'Food',
     accessor: 'favorites.food'
   } {
-    header: 'Actor',
+    Header: 'Actor',
     accessor: 'favorites.actor'
   }]
 }]
 ```
 
-## Custom Cell & Header Rendering
-You can use any react component or JSX to display column headers or cells. Any component you use will be passed the following props:
+## Custom Cell, Header and Footer Rendering
+You can use any react component or JSX to display content in column headers, cells and footers. Any component you use will be passed the following props (if available):
 - `row` - Original row from your data
-- `rowValues` - The post-accessed values from the original row
+- `row` - The post-accessed values from the original row
 - `index` - The index of the row
 - `viewIndex` - the index of the row relative to the current page
 - `level` - The nesting depth (zero-indexed)
@@ -307,9 +508,9 @@ You can use any react component or JSX to display column headers or cells. Any c
 // This column uses a stateless component to produce a different colored bar depending on the value
 // You can also use stateful components or any other function that returns JSX
 const columns = [{
-  header: () => <span><i className='fa-tasks' /> Progress</span>,
+  Header: () => <span><i className='fa-tasks' /> Progress</span>,
   accessor: 'progress',
-  render: row => (
+  Cell: row => (
     <div
       style={{
         width: '100%',
@@ -335,17 +536,19 @@ const columns = [{
 ```
 
 ## Styles
-React-table ships with a minimal and clean stylesheet to get you on your feet quickly. It's located at `react-table/react-table.css`.
+- React-table ships with a minimal and clean stylesheet to get you on your feet quickly.
+- The stylesheet is located at `react-table/react-table.css`.
+- There are countless ways to import a stylesheet. If you have questions on how to do so, consult the documentation of your build system.
 
-#### Built-in Styles
+#### Classes
 - Adding a `-striped` className to ReactTable will slightly color odd numbered rows for legibility
 - Adding a `-highlight` className to ReactTable will highlight any row as you hover over it
 
-#### CSS Styles
+#### CSS
 We think the default styles looks great! But, if you prefer a more custom look, all of the included styles are easily overridable. Every single component contains a unique class that makes it super easy to customize. Just go for it!
 
 #### JS Styles
-Every single react-table element and `get[ComponentName]Props` callback support classes (powered by `classname` and js styles.
+Every single react-table element and `get[ComponentName]Props` callback supports `classname` and `style` props.
 
 ## Custom Props
 
@@ -368,14 +571,18 @@ Every single built-in component's props can be dynamically extended using any on
   getTdProps={fn}
   getPaginationProps={fn}
   getLoadingProps={fn}
+  getNoDataProps={fn}
+  getResizerProps={fn}
 />
 ```
 
-These callbacks are executed with each render of the element with three parameters:
-1. Table State
-1. RowInfo (undefined if not applicable)
-1. Column (undefined if not applicable)
-1. React Table Instance
+If used, **a callback prop must return an valid object**, even if it's an empty one.
+
+These callbacks are executed with each render of the element with four parameters:
+ 1. Table State
+ 2. RowInfo (undefined if not applicable)
+ 3. Column (undefined if not applicable)
+ 4. React Table Instance
 
 This makes it extremely easy to add, say... a row click callback!
 ```javascript
@@ -383,12 +590,21 @@ This makes it extremely easy to add, say... a row click callback!
 <ReactTable
   getTdProps={(state, rowInfo, column, instance) => {
     return {
-      onClick: e => {
+      onClick: (e, handleOriginal) => {
         console.log('A Td Element was clicked!')
         console.log('it produced this event:', e)
         console.log('It was in this column:', column)
         console.log('It was in this row:', rowInfo)
         console.log('It was in this table instance:', instance)
+
+        // IMPORTANT! React-Table uses onClick internally to trigger
+        // events like expanding SubComponents and pivots.
+        // By default a custom 'onClick' handler will override this functionality.
+        // If you want to fire the original onClick handler, call the
+        // 'handleOriginal' function.
+        if (handleOriginal) {
+          handleOriginal()
+        }
       }
     }
   }}
@@ -402,7 +618,7 @@ You can use these callbacks for dynamic styling as well!
   getTrProps={(state, rowInfo, column) => {
     return {
       style: {
-        background: rowInfo.age > 20 ? 'green' : 'red'
+        background: rowInfo.row.age > 20 ? 'green' : 'red'
       }
     }
   }}
@@ -427,14 +643,14 @@ const columns = [{
   getProps: (state, rowInfo, column) => {
     return {
       style: {
-        background: rowInfo.name === 'Santa Clause' ? 'red' : null
+        background: rowInfo.row.name === 'Santa Clause' ? 'red' : null
       }
     }
   }
 }]
 ```
 
-## Pivoting & Aggregation
+## Pivoting and Aggregation
 Pivoting the table will group records together based on their accessed values and allow the rows in that group to be expanded underneath it.
 To pivot, pass an array of `columnID`'s to `pivotBy`. Remember, a column's `id` is either the one that you assign it (when using a custom accessors) or its `accessor` string.
 ```javascript
@@ -448,23 +664,23 @@ Naturally when grouping rows together, you may want to aggregate the rows inside
 ```javascript
 // In this example, we use lodash to sum and average the values, but you can use whatever you want to aggregate.
 const columns = [{
-  header: 'Age',
+  Header: 'Age',
   accessor: 'age',
   aggregate: (values, rows) => _.round(_.mean(values)),
-  render: row => {
+  Aggregated: row => {
     // You can even render the cell differently if it's an aggregated cell
-    return <span>{row.aggregated ? `${row.value} (avg)` : row.value}</span>
+    return <span>row.value (avg)</span>
   }
 }, {
-  header: 'Visits',
+  Header: 'Visits',
   accessor: 'visits',
   aggregate: (values, rows) => _.sum(values)
 }]
 ```
 
-Pivoted columns can be sorted just like regular columns, but not independently of each other.  For instance, if you click to sort the pivot column in ascending order, it will sort by each pivot recursively in ascending order together.
+Pivoted columns can be sorted just like regular columns including holding down the `<shift>` button to multi-sort.
 
-## Sub Tables & Sub Components
+## Sub Tables and Sub Components
 By adding a `SubComponent` props, you can easily add an expansion level to all root-level rows:
 ```javascript
 <ReactTable
@@ -483,12 +699,12 @@ By adding a `SubComponent` props, you can easily add an expansion level to all r
 
 
 ## Server-side Data
-If you want to handle pagination, and sorting on the server, `react-table` makes it easy on you.
+If you want to handle pagination, sorting, and filtering on the server, `react-table` makes it easy on you.
 
 1. Feed React Table `data` from somewhere dynamic. eg. `state`, a redux store, etc...
 1. Add `manual` as a prop. This informs React Table that you'll be handling sorting and pagination server-side
-1. Subscribe to the `onChange` prop. This function is called at `compomentDidMount` and any time sorting or pagination is changed by the user
-1. In the `onChange` callback, request your data using the provided information in the params of the function (state and instance)
+1. Subscribe to the `onFetchData` prop. This function is called at `compomentDidMount` and any time sorting, pagination or filterting is changed in the table
+1. In the `onFetchData` callback, request your data using the provided information in the params of the function (current state and instance)
 1. Update your data with the rows to be displayed
 1. Optionally set how many pages there are total
 
@@ -499,14 +715,15 @@ If you want to handle pagination, and sorting on the server, `react-table` makes
   pages={this.state.pages} // should default to -1 (which means we don't know how many pages we have)
   loading={this.state.loading}
   manual // informs React Table that you'll be handling sorting and pagination server-side
-  onChange={(state, instance) => {
+  onFetchData={(state, instance) => {
     // show the loading overlay
     this.setState({loading: true})
     // fetch your data
     Axios.post('mysite.com/data', {
       page: state.page,
       pageSize: state.pageSize,
-      sorting: state.sorting
+      sorted: state.sorted,
+      filtered: state.filtered
     })
       .then((res) => {
         // Update react-table
@@ -520,7 +737,7 @@ If you want to handle pagination, and sorting on the server, `react-table` makes
 />
 ```
 
-For a detailed example, take a peek at our <a href="https://github.com/tannerlinsley/react-table/blob/master/stories/ServerSide.js" target="\_parent">async table mockup</a>
+For a detailed example, take a peek at our <a href="https://github.com/react-tools/react-table/blob/master/stories/ServerSide.js" target="\_parent">async table mockup</a>
 
 ## Fully Controlled Component
 React Table by default works fantastically out of the box, but you can achieve even more control and customization if you choose to maintain the state yourself. It is very easy to do, even if you only want to manage *parts* of the state.
@@ -531,97 +748,158 @@ Here are the props and their corresponding callbacks that control the state of t
   // Props
   page={0} // the index of the page you wish to display
   pageSize={20} // the number of rows per page to be displayed
-  sorting={[{
+  sorted={[{ // the sorting model for the table
       id: 'lastName',
-      asc: true
+      desc: true
     }, {
       id: 'firstName',
-      asc: true
-  }]} // the sorting model for the table
-  expandedRows={{
+      desc: true
+  }]}
+  expanded={{ // The nested row indexes on the current page that should appear expanded
     1: true,
     4: true,
     5: {
       2: true,
       3: true
     }
-  }} // The nested row indexes on the current page that should appear expanded
+  }}
+  filtered={[{ // the current filters model
+    id: 'lastName',
+    value: 'linsley'
+  }]}
+  resized={[{ // the current resized column model
+    "id": "lastName",
+    "value": 446.25
+  }]}
 
   // Callbacks
   onPageChange={(pageIndex) => {...}} // Called when the page index is changed by the user
   onPageSizeChange={(pageSize, pageIndex) => {...}} // Called when the pageSize is changed by the user. The resolve page is also sent to maintain approximate position in the data
-  onSortingChange={(column, shiftKey) => {...}} // Called when a sortable column header is clicked with the column itself and if the shiftkey was held. If the column is a pivoted column, `column` will be an array of columns
-  onExpandRow={(index, event) => {...}} // Called when an expander is clicked. Use this to manage `expandedRows`
+  onSortedChange={(newSorted, column, shiftKey) => {...}} // Called when a sortable column header is clicked with the column itself and if the shiftkey was held. If the column is a pivoted column, `column` will be an array of columns
+  onExpandedChange={(newExpanded, index, event) => {...}} // Called when an expander is clicked. Use this to manage `expanded`
+  onFilteredChange={(column, value) => {...}} // Called when a user enters a value into a filter input field or the value passed to the onFiltersChange handler by the Filter option.
+  onResizedChange={(newResized, event) => {...}} // Called when a user clicks on a resizing component (the right edge of a column header)
 />
 ```
 
 ## Functional Rendering
-Possibly one of the coolest features of React-Table is its ability to expose internal state for custom render logic. The easiest way to do this is to optionally pass a function as a child of `<ReactTable />`.
+Possibly one of the coolest features of React-Table is its ability to expose internal components and state for custom render logic. The easiest way to do this is to pass a function as the child of `<ReactTable />`.
 
 The function you pass will be called with the following items:
 - Fully-resolved state of the table
-- The standard table generator
+- A function that returns the standard table component
 - The instance of the component
 
 You can then return any JSX or react you want! This turns out to be perfect for:
-- Accessing the internal state of the table before rendering the table
-- Decorating the table with more UI
-- Building your own 100% custom display logic, while utilizing the state and methods of the table component
+- Accessing the internal state of the table without a `ref`
+- Decorating the table or extending it with your own UI
+- Building your own custom display logic
 
-Example:
+Accessing internal state and wrapping with more UI:
 ```javascript
 <ReactTable
-  columns={columns}
   data={data}
-  ...
+  columns={columns}
 >
   {(state, makeTable, instance) => {
-    // Now you have full access to the state of the table!
-    state.decoratedColumns === [...] // all of the columns (with id's and meta)
-    state.visibleColumns === [...] // all of the columns (with id's and meta)
-    state.visibleColumns === [...] // all of the columns (with id's and meta)
-    // etc.
-
-    // `makeTable` is a function that returns the standard table markup
-    return makeTable()
-
-    // So add some decoration!
     return (
-      <div>
-        <customPivotBySelect />
-        <customColumnHideShow />
-        <customAnything />
+      <div style={{
+        background: '#ffcf00',
+        borderRadius: '5px',
+        overflow: 'hidden',
+        padding: '5px'
+      }}>
+        <pre><code>state.allVisibleColumns === {JSON.stringify(state.allVisibleColumns, null, 4)}</code></pre>
         {makeTable()}
       </div>
     )
-
-    // The possibilities are endless!!!
-
   }}
 </ReactTable>
 ```
 
+The possibilities are endless!
+
+## Sorting
+Sorting comes built in with React-Table.
+- Click a column header to sort by its accessor.
+- Click it again to reverse the sort.
+- Set `defaultSortDesc` property to `true` to make the first sort direction default to descending.
+- Override a specific column's default sort direction by using the same `defaultSortDesc` property on a column, set to `true`
+
 ## Multi-Sort
 When clicking on a column header, hold shift to multi-sort! You can toggle `ascending` `descending` and `none` for multi-sort columns. Clicking on a header without holding shift will clear the multi-sort and replace it with the single sort of that column. It's quite handy!
 
+## Custom Sorting Algorithm
+To override the default sorting algorithm for the whole table use the `defaultSortMethod` prop.
+
+To override the sorting algorithm for a single column, use the `sortMethod` column property.
+
+Supply a function that implements the native javascript [`Array.sort`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort) interface. This is React Table's default sorting algorithm:
+- `a` the first value to compare
+- `b` the second value to compare
+- `dir` the
+```javascript
+defaultSortMethod = (a, b) => {
+  // force null and undefined to the bottom
+  a = (a === null || a === undefined) ? -Infinity : a
+  b = (b === null || b === undefined) ? -Infinity : 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 or undefined will use any subsequent column sorting methods or the row index as a tiebreaker
+  return 0
+}
+```
+
+## Filtering
+Filtering can be enabled by setting the `filterable` option on the table.
+
+If you don't want particular column to be filtered you can set the `filterable={false}` option on the column.
+
+By default the table tries to filter by checking if the row's value starts with the filter text. The default method for filtering the table can be set with the table's `defaultFilterMethod` option.
+
+If you want to override a particular column's filtering method, you can set the `filterMethod` option on a column.
+
+By default, `filterMethod` is passed a single row of data at a time, and you are responsible for returning `true` or `false`, indicating whether it should be shown.
+
+Alternatively, you can set `filterAll` to `true`, and `filterMethod` will be passed the entire array of rows to be filtered, and you will then be responsible for returning the new filtered array. This is extremely handy when you need to utilize a utility like fuzzy matching that requires the entire array of items.
+
+To completely override the filter that is shown, you can set the `Filter` column option. Using this option you can specify the JSX that is shown. The option is passed an `onChange` method which must be called with the the value that you wan't to pass to the `filterMethod` option whenever the filter has changed.
+
+See <a href="http://react-table.js.org/#/story/custom-filtering" target="\_parent">Custom Filtering</a> demo for examples.
+
 ## Component Overrides
 Though we confidently stand by the markup and architecture behind it, `react-table` does offer the ability to change the core componentry it uses to render everything. You can extend or override these internal components by passing a react component to it's corresponding prop on either the global props or on a one-off basis like so:
 ```javascript
 // Change the global default
 import { ReactTableDefaults } from 'react-table'
 Object.assign(ReactTableDefaults, {
-  TableComponent: Component,
-  TheadComponent: Component,
-  TbodyComponent: Component,
-  TrGroupComponent: Component,
-  TrComponent: Component,
-  ThComponent: Component,
-  TdComponent: Component,
-  PaginationComponent: Component,
-  PreviousComponent: Component,
-  NextComponent: Component,
-  LoadingComponent: Component,
-  ExpanderComponent: Component
+  TableComponent: component,
+  TheadComponent: component,
+  TbodyComponent: component,
+  TrGroupComponent: component,
+  TrComponent: component,
+  ThComponent: component
+  TdComponent: component,
+  TfootComponent: component,
+  ExpanderComponent: component,
+  AggregatedComponent: component,
+  PivotValueComponent: component,
+  PivotComponent: component,
+  FilterComponent: component,
+  PaginationComponent: component,
+  PreviousComponent: undefined,
+  NextComponent: undefined,
+  LoadingComponent: component,
+  NoDataComponent: component,
+  ResizerComponent: component
 })
 
 // Or change per instance
@@ -632,7 +910,7 @@ Object.assign(ReactTableDefaults, {
   />
 ```
 
-If you choose to change the core components React-Table uses to render, you must make sure your replacement components consume and utilize all of the supplied and inherited props that are needed for that component to function properly. We would suggest investigating <a href="https://github.com/tannerlinsley/react-table/blob/master/src/index.js" target="\_parent">the source</a> for the component you wish to replace.
+If you choose to change the core components React-Table uses to render, you must make sure your replacement components consume and utilize all of the supplied and inherited props that are needed for that component to function properly. We would suggest investigating <a href="https://github.com/react-tools/react-table/blob/master/src/index.js" target="\_parent">the source</a> for the component you wish to replace.
 
 
 ## Contributing
@@ -640,19 +918,18 @@ To suggest a feature, create an issue if it does not already exist.
 If you would like to help develop a suggested feature follow these steps:
 
 - Fork this repo
-- `$ yarn`
-- `$ yarn run storybook`
+- Install dependencies with `$ yarn`
+- Auto-build files as you edit with `$ yarn run watch`
 - Implement your changes to files in the `src/` directory
-- View changes as you code via our <a href="https://github.com/storybooks/react-storybook" target="\_parent">React Storybook</a> `localhost:8000`
-- Make changes to stories in `/stories`, or create a new one if needed
+- Run the <a href="https://github.com/tannerlinsley/react-story">React Story</a> locally with `$ yarn run docs`
+- View changes as you edit `docs/src`,
 - Submit PR for review
 
 #### Scripts
 
-- `$ yarn run storybook` Runs the storybook server
+- `$ yarn run watch` Watches files and builds via babel
+- `$ yarn run docs` Runs the storybook server
 - `$ yarn run test` Runs the test suite
-- `$ yarn run prepublish` Builds the distributable bundle
-- `$ yarn run docs` Builds the website/docs from the storybook for github pages
 
 ## Used By
 

docs/.eslintrc.js

@@ -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 }]
+  }
+}

docs/CNAME

@@ -1 +1 @@
-react-table.js.org
+react-table.js.org

docs/iframe.html

@@ -1,22 +0,0 @@
-
-    <!DOCTYPE html>
-    <html>
-      <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <script>
-          if (window.parent !== window) {
-            window.__REACT_DEVTOOLS_GLOBAL_HOOK__ = window.parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
-          }
-        </script>
-        <title>React Storybook</title>
-        
-        
-      </head>
-      <body>
-        <div id="root"></div>
-        <div id="error-display"></div>
-        <script src="static/preview.ee446fa2bd3fbfe7e38a.bundle.js"></script>
-      </body>
-    </html>
-  

docs/index.html

@@ -1,44 +0,0 @@
-
-    <!DOCTYPE html>
-    <html>
-      <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <meta name="storybook-version" content="2.35.3">
-        <title>React Storybook</title>
-        <style>
-          /*
-            When resizing panels, the drag event breaks if the cursor
-            moves over the iframe. Add the 'dragging' class to the body
-            at drag start and remove it when the drag ends.
-           */
-          .dragging iframe {
-            pointer-events: none;
-          }
-
-          /* Styling the fuzzy search box placeholders */
-          .searchBox::-webkit-input-placeholder { /* Chrome/Opera/Safari */
-            color: #ddd;
-            font-size: 16px;
-          }
-
-          .searchBox::-moz-placeholder { /* Firefox 19+ */
-            color: #ddd;
-            font-size: 16px;
-          }
-
-          .searchBox:focus{
-            border-color: #EEE !important;
-          }
-
-          .btn:hover{
-            background-color: #eee
-          }
-        </style>
-      </head>
-      <body style="margin: 0;">
-        <div id="root"></div>
-        <script src="static/manager.f127c5ae855df8d8558a.bundle.js"></script>
-      </body>
-    </html>
-  

docs/package.json

@@ -0,0 +1,43 @@
+{
+  "name": "new",
+  "version": "0.1.0",
+  "private": true,
+  "devDependencies": {
+    "react-scripts": "0.9.5",
+    "standard": "^10.0.2",
+    "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",
+    "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",
+    "webpack": "^2.5.1"
+  },
+  "dependencies": {
+    "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-story": "^0.0.10"
+  },
+  "scripts": {
+    "start": "react-scripts start",
+    "build": "react-scripts build",
+    "test": "react-scripts test --env=jsdom",
+    "eject": "react-scripts eject"
+  }
+}

docs/public/index.html

@@ -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>

docs/src/App.js

@@ -0,0 +1,103 @@
+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'
+
+const stories = [
+  { name: 'Readme', component: Readme },
+  { 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'),
+  },
+]
+
+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}
+      />
+    )
+  }
+}

docs/src/CodeSandbox.js

@@ -0,0 +1,22 @@
+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'
+    />
+  )
+}

docs/src/index.css

@@ -0,0 +1,8 @@
+html, body, #root {
+  height: 100%
+}
+body {
+  margin: 0;
+  padding: 0;
+  font-family: sans-serif;
+}

docs/src/index.js

@@ -0,0 +1,10 @@
+import React from 'react'
+import ReactDOM from 'react-dom'
+//
+import './index.css'
+import App from './App.js'
+
+ReactDOM.render(
+  <App />,
+  document.getElementById('root')
+)

docs/src/stories/Readme.js

@@ -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()
+  }
+}

docs/static/manager.f127c5ae855df8d8558a.bundle.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"static/manager.f127c5ae855df8d8558a.bundle.js","sources":["webpack:///static/manager.f127c5ae855df8d8558a.bundle.js"],"mappings":"AAAA;AAkuDA;AA84DA;AA28DA;AA00DA;AAsyEA;AA89CA;AA8rDA;AAsiDA;AAg6DA;AA2nDA;AA++CA;AAkvDA;AAsnEA;AA2oDA;AAivCA;AA+nDA;AAkpDA;AA6lEA;AAs4DA;AAquDA;AA+pDA;AAqxDA;AAsrDA;AAwyDA;AA88GA;AAj6CA;AAopGA;AAsuFA;AA+zEA;AAtMA;AAizEA","sourceRoot":""}

docs/static/preview.ee446fa2bd3fbfe7e38a.bundle.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"static/preview.ee446fa2bd3fbfe7e38a.bundle.js","sources":["webpack:///static/preview.ee446fa2bd3fbfe7e38a.bundle.js"],"mappings":"AAAA;AAkuDA;AAiwDA;AAs1EA;AA+gGA;AAo4IA;AAt5NA;AA4udA;AA2hEA;AA2uDA;AA29DA;AA2gDA;AAosDA;AAuhDA;AA+6DA;AAioDA;AA4+CA;AAwpDA;AAisEA;AAqoDA;AAqwCA;AA2oDA;AAowDA;AAokEA;AA0vDA;AA2rDA;AA8nDA;AAwrFA;AAyiGA;AA0/CA;AAqyCA;AA22CA;AAu/CA;AAyGA;AA+jFA","sourceRoot":""}

package.json

@@ -1,12 +1,12 @@
 {
   "name": "react-table",
-  "version": "5.0.2",
+  "version": "6.5.3",
   "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",
@@ -24,61 +24,44 @@
   ],
   "scripts": {
     "build:node": "babel src --out-dir lib --source-maps inline",
-    "build:css": "rm -rf react-table.css && stylus src/index.styl --compress -o react-table.css && yarn run css:autoprefix",
+    "build:css": "rimraf react-table.css && stylus src/index.styl --compress -o react-table.css && yarn run css:autoprefix",
     "css:autoprefix": "postcss --use autoprefixer react-table.css -r",
     "watch": "npm-run-all --parallel watch:*",
     "watch:node": "onchange 'src/**/*.js' -i -- npm run build:node",
     "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",
-    "docs": "build-storybook -o docs && cp .storybook/CNAME docs/CNAME"
+    "test": "eslint src",
+    "umd": "rimraf react-table.js && webpack --config umd.webpack.js",
+    "build": "npm-run-all build:*",
+    "prepublish": "npm run build && npm run umd",
+    "postpublish": "git push --tags",
+    "docs": "yarn watch & cd docs && yarn && yarn start",
+    "docs:build": "yarn build && cd docs && yarn && yarn run 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",
+    "eslint": "^4.1.1",
+    "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.1",
-    "standard": "^8.0.0",
+    "react-json-tree": "^0.10.9",
+    "rimraf": "^2.6.1",
+    "standard": "^10.0.2",
     "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",
-      "docs"
-    ]
+    "webpack": "^2.5.1"
   },
   "babel": {
     "presets": [

src/componentMethods.js

@@ -1,405 +0,0 @@
-import _ from './utils'
-
-export default {
-  getDataModel (nextProps, nextState) {
-    const {
-      columns,
-      pivotBy = [],
-      data,
-      pivotIDKey,
-      pivotValKey,
-      subRowsKey,
-      expanderColumnWidth,
-      SubComponent
-    } = this.getResolvedState(nextProps, nextState)
-
-    // Determine Header Groups
-    let hasHeaderGroups = false
-    columns.forEach(column => {
-      if (column.columns) {
-        hasHeaderGroups = true
-      }
-    })
-
-    // Build Header Groups
-    const headerGroups = []
-    let currentSpan = []
-
-    // A convenience function to add a header and reset the currentSpan
-    const addHeader = (columns, column = columns[0]) => {
-      headerGroups.push({
-        ...this.props.column,
-        ...column,
-        columns: columns
-      })
-      currentSpan = []
-    }
-
-    const noSubExpanderColumns = columns.map(col => {
-      return {
-        ...col,
-        columns: col.columns ? col.columns.filter(d => !d.expander) : undefined
-      }
-    })
-
-    let expanderColumnIndex = columns.findIndex(col => col.expander)
-    const needsExpander = (SubComponent || pivotBy.length) && expanderColumnIndex === -1
-    const columnsWithExpander = needsExpander ? [{expander: true}, ...noSubExpanderColumns] : noSubExpanderColumns
-    if (needsExpander) {
-      expanderColumnIndex = 0
-    }
-
-    const makeDecoratedColumn = (column) => {
-      const dcol = {
-        ...this.props.column,
-        ...column
-      }
-
-      if (dcol.expander) {
-        dcol.width = expanderColumnWidth
-        return dcol
-      }
-
-      if (typeof dcol.accessor === 'string') {
-        dcol.id = dcol.id || dcol.accessor
-        const accessorString = dcol.accessor
-        dcol.accessor = row => _.get(row, accessorString)
-        return dcol
-      }
-
-      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.')
-      }
-
-      if (!dcol.accessor) {
-        dcol.accessor = d => undefined
-      }
-
-      // Ensure minWidth is not greater than maxWidth if set
-      if (dcol.maxWidth < dcol.minWidth) {
-        dcol.minWidth = dcol.maxWidth
-      }
-
-      return dcol
-    }
-
-    // Decorate the columns
-    const decorateAndAddToAll = (col) => {
-      const decoratedColumn = makeDecoratedColumn(col)
-      allDecoratedColumns.push(decoratedColumn)
-      return decoratedColumn
-    }
-    let allDecoratedColumns = []
-    const decoratedColumns = columnsWithExpander.map((column, i) => {
-      if (column.columns) {
-        return {
-          ...column,
-          columns: column.columns.map(decorateAndAddToAll)
-        }
-      } else {
-        return decorateAndAddToAll(column)
-      }
-    })
-
-    // Build the visible columns, headers and flat column list
-    let visibleColumns = decoratedColumns.slice()
-    let allVisibleColumns = []
-
-    visibleColumns = visibleColumns.map((column, i) => {
-      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 => {
-      return column.columns ? column.columns.length : pivotBy.indexOf(column.id) > -1 ? false : _.getFirstDefined(column.show, true)
-    })
-
-    // Move the pivot columns into a single column if needed
-    if (pivotBy.length) {
-      const pivotColumns = []
-      for (var i = 0; i < allDecoratedColumns.length; i++) {
-        if (pivotBy.indexOf(allDecoratedColumns[i].id) > -1) {
-          pivotColumns.push(allDecoratedColumns[i])
-        }
-      }
-      const pivotColumn = {
-        ...pivotColumns[0],
-        pivotColumns,
-        expander: true
-      }
-      visibleColumns[expanderColumnIndex] = pivotColumn
-    }
-
-    // Build flast list of allVisibleColumns and HeaderGroups
-    visibleColumns.forEach((column, i) => {
-      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
-    let resolvedData = data.map((d, i) => {
-      const row = {
-        __original: d,
-        __index: i
-      }
-      allDecoratedColumns.forEach(column => {
-        if (column.expander) return
-        row[column.id] = column.accessor(d)
-      })
-      return row
-    })
-
-    // 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
-    }
-    let standardColumns = pivotBy.length ? allVisibleColumns.slice(1) : allVisibleColumns
-    const aggregatingColumns = standardColumns.filter(d => d.aggregate)
-    let pivotColumn
-    if (pivotBy.length) {
-      pivotColumn = allVisibleColumns[0]
-      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]) => {
-              return {
-                [pivotIDKey]: keys[i],
-                [pivotValKey]: key,
-                [keys[i]]: key,
-                [subRowsKey]: value
-              }
-            }
-        )
-        // Recurse into the subRows
-        groupedRows = groupedRows.map(rowGroup => {
-          let subRows = groupRecursively(rowGroup[subRowsKey], keys, i + 1)
-          return {
-            ...rowGroup,
-            [subRowsKey]: subRows,
-            ...aggregate(subRows)
-          }
-        })
-        return groupedRows
-      }
-      resolvedData = groupRecursively(resolvedData, pivotBy)
-    }
-
-    return {
-      resolvedData,
-      pivotColumn,
-      allVisibleColumns,
-      headerGroups,
-      allDecoratedColumns,
-      hasHeaderGroups
-    }
-  },
-  getSortedData (nextProps, nextState) {
-    const {
-      manual,
-      sorting,
-      allDecoratedColumns,
-      resolvedData
-    } = this.getResolvedState(nextProps, nextState)
-
-    const resolvedSorting = sorting.length ? sorting : this.getInitSorting(allDecoratedColumns)
-
-    // Resolve the data from either manual data or sorted data
-    return {
-      resolvedSorting,
-      sortedData: manual ? resolvedData : this.sortData(resolvedData, resolvedSorting)
-    }
-  },
-
-  fireOnChange () {
-    this.props.onChange(this.getResolvedState(), this)
-  },
-  getPropOrState (key) {
-    return _.getFirstDefined(this.props[key], this.state[key])
-  },
-  getStateOrProp (key) {
-    return _.getFirstDefined(this.state[key], this.props[key])
-  },
-  getInitSorting (columns) {
-    if (!columns) {
-      return []
-    }
-    const initSorting = columns.filter(d => {
-      return typeof d.sort !== 'undefined'
-    }).map(d => {
-      return {
-        id: d.id,
-        asc: d.sort === 'asc'
-      }
-    })
-
-    return initSorting
-
-    // return initSorting.length ? initSorting : [{
-    //   id: columns.find(d => d.id).id,
-    //   asc: true
-    // }]
-  },
-  sortData (data, sorting) {
-    const sorted = _.orderBy(data, 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'))
-
-    return sorted.map(row => {
-      if (!row[this.props.subRowsKey]) {
-        return row
-      }
-      return {
-        ...row,
-        [this.props.subRowsKey]: this.sortData(row[this.props.subRowsKey], sorting)
-      }
-    })
-  },
-
-  getMinRows () {
-    return _.getFirstDefined(this.props.minRows, this.getStateOrProp('pageSize'))
-  },
-
-  // User actions
-  onPageChange (page) {
-    const { onPageChange } = this.props
-    if (onPageChange) {
-      return onPageChange(page)
-    }
-    this.setStateWithData({
-      expandedRows: {},
-      page
-    }, () => {
-      this.fireOnChange()
-    })
-  },
-  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)
-
-    if (onPageSizeChange) {
-      return onPageSizeChange(newPageSize, newPage)
-    }
-
-    this.setStateWithData({
-      pageSize: newPageSize,
-      page: newPage
-    }, () => {
-      this.fireOnChange()
-    })
-  },
-  sortColumn (column, additive) {
-    const { sorting } = this.getResolvedState()
-    const { onSortingChange } = this.props
-    if (onSortingChange) {
-      return onSortingChange(column, additive)
-    }
-    let newSorting = _.clone(sorting || [])
-    if (_.isArray(column)) {
-      const existingIndex = newSorting.findIndex(d => d.id === column[0].id)
-      if (existingIndex > -1) {
-        const existing = newSorting[existingIndex]
-        if (existing.asc) {
-          column.forEach((d, i) => {
-            newSorting[existingIndex + i].asc = false
-          })
-        } else {
-          if (additive) {
-            newSorting.splice(existingIndex, column.length)
-          } else {
-            column.forEach((d, i) => {
-              newSorting[existingIndex + i].asc = true
-            })
-          }
-        }
-        if (!additive) {
-          newSorting = newSorting.slice(existingIndex, column.length)
-        }
-      } else {
-        if (additive) {
-          newSorting = newSorting.concat(column.map(d => ({
-            id: d.id,
-            asc: true
-          })))
-        } else {
-          newSorting = column.map(d => ({
-            id: d.id,
-            asc: true
-          }))
-        }
-      }
-    } else {
-      const existingIndex = newSorting.findIndex(d => d.id === column.id)
-      if (existingIndex > -1) {
-        const existing = newSorting[existingIndex]
-        if (existing.asc) {
-          existing.asc = false
-          if (!additive) {
-            newSorting = [existing]
-          }
-        } else {
-          if (additive) {
-            newSorting.splice(existingIndex, 1)
-          } else {
-            existing.asc = true
-            newSorting = [existing]
-          }
-        }
-      } else {
-        if (additive) {
-          newSorting.push({
-            id: column.id,
-            asc: true
-          })
-        } else {
-          newSorting = [{
-            id: column.id,
-            asc: true
-          }]
-        }
-      }
-    }
-    this.setStateWithData({
-      page: ((!sorting.length && newSorting.length) || !additive) ? 0 : this.state.page,
-      sorting: newSorting
-    }, () => {
-      this.fireOnChange()
-    })
-  }
-}

src/defaultProps.js

@@ -0,0 +1,243 @@
+import React from 'react'
+import classnames from 'classnames'
+//
+import _ from './utils'
+import Pagination from './pagination'
+
+const emptyObj = () => ({})
+
+export default {
+  // General
+  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,
+  resizable: true,
+  filterable: false,
+  defaultSortDesc: false,
+  defaultSorted: [],
+  defaultFiltered: [],
+  defaultResized: [],
+  defaultExpanded: {},
+  defaultFilterMethod: (filter, row, column) => {
+    const id = filter.pivotId || filter.id
+    return row[id] !== undefined
+      ? String(row[id]).startsWith(filter.value)
+      : true
+  },
+  defaultSortMethod: (a, b) => {
+    // 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: _.makeTemplateComponent('rt-table', 'Table'),
+  TheadComponent: _.makeTemplateComponent('rt-thead', 'Thead'),
+  TbodyComponent: _.makeTemplateComponent('rt-tbody', 'Tbody'),
+  TrGroupComponent: _.makeTemplateComponent('rt-tr-group', 'TrGroup'),
+  TrComponent: _.makeTemplateComponent('rt-tr', 'Tr'),
+  ThComponent: ({ toggleSort, className, children, ...rest }) => {
+    return (
+      <div
+        className={classnames(className, 'rt-th')}
+        onClick={e => {
+          toggleSort && toggleSort(e)
+        }}
+        {...rest}
+      >
+        {children}
+      </div>
+    )
+  },
+  TdComponent: _.makeTemplateComponent('rt-td', 'Td'),
+  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) =>
+        <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>,
+}

src/index.styl

@@ -4,10 +4,13 @@ $expandSize = 7px
 
 .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
@@ -16,12 +19,24 @@ $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)
+
+      .rt-th
+        border-right: 1px solid alpha(black, 0.02)
+
     &.-header
       box-shadow: 0 2px 15px 0px alpha(black, .15)
 
@@ -30,7 +45,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
@@ -42,9 +59,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)
@@ -54,13 +108,15 @@ $expandSize = 7px
       border-right:1px solid alpha(black, .02)
       &:last-child
         border-right:0
-    .rt-pivot
+    .rt-expandable
       cursor: pointer
   .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
@@ -101,6 +157,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)
@@ -117,12 +194,23 @@ $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
+      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
 
     .-btn
       appearance:none
       display:block
       width:100%
-      height: 100%
+      height:100%
       border: 0
       border-radius: 3px
       padding: 6px
@@ -170,6 +258,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
@@ -180,7 +280,7 @@ $expandSize = 7px
     bottom:0
     background: alpha(white, .8)
     transition: all .3s ease
-    z-index: 2
+    z-index: -1
     opacity: 0
     pointer-events: none
 
@@ -198,33 +298,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

src/lifecycle.js

@@ -0,0 +1,134 @@
+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 (var i = 0; i < keys.length; i++) {
+          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, () => {
+        cb && cb()
+        if (
+          oldState.page !== newResolvedState.page ||
+          oldState.pageSize !== newResolvedState.pageSize ||
+          oldState.sorted !== newResolvedState.sorted ||
+          oldState.filtered !== newResolvedState.filtered
+        ) {
+          this.fireFetchData()
+        }
+      })
+    }
+  }

src/methods.js

@@ -0,0 +1,717 @@
+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,
+        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 = d => undefined
+        }
+
+        return dcol
+      }
+
+      // Decorate the columns
+      const decorateAndAddToAll = (column, parentColumn) => {
+        const decoratedColumn = makeDecoratedColumn(column, parentColumn)
+        allDecoratedColumns.push(decoratedColumn)
+        return decoratedColumn
+      }
+      const allDecoratedColumns = []
+      const decoratedColumns = columnsWithExpander.map((column, i) => {
+        if (column.columns) {
+          return {
+            ...column,
+            columns: column.columns.map(d => decorateAndAddToAll(d, column)),
+          }
+        } else {
+          return decorateAndAddToAll(column)
+        }
+      })
+
+      // Build the visible columns, headers and flat column list
+      let visibleColumns = decoratedColumns.slice()
+      let allVisibleColumns = []
+
+      visibleColumns = visibleColumns.map((column, i) => {
+        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 => {
+        return 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)
+          }
+        })
+
+        let 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: columns,
+        })
+        currentSpan = []
+      }
+
+      // Build flast list of allVisibleColumns and HeaderGroups
+      visibleColumns.forEach((column, i) => {
+        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 = data.map((d, i) => accessRow(d, i))
+
+      // 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
+      }
+
+      // TODO: Make it possible to fabricate nested rows without pivoting
+      const aggregatingColumns = allVisibleColumns.filter(
+        d => !d.expander && d.aggregate
+      )
+      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]) => {
+            return {
+              [pivotIDKey]: keys[i],
+              [pivotValKey]: key,
+              [keys[i]]: key,
+              [subRowsKey]: value,
+              [nestingLevelKey]: i,
+              [groupedByPivotKey]: true,
+            }
+          })
+          // Recurse into the subRows
+          groupedRows = groupedRows.map(rowGroup => {
+            let 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)
+          } else {
+            return filteredSoFar.filter(row => {
+              return 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) => {
+              return sortMethodsByColumnID[sort.id](a[sort.id], b[sort.id])
+            }
+          }
+          return (a, b) => {
+            return this.props.defaultSortMethod(a[sort.id], b[sort.id])
+          }
+        }),
+        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 = column.hasOwnProperty('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)
+          }
+        } else {
+          // New Sort Column
+          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 => {
+        if (x.id !== column.id) {
+          return true
+        }
+      })
+
+      if (value !== '') {
+        newFiltering.push({
+          id: column.id,
+          value: 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: 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()
+      let 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,
+        })
+      }
+    }
+  }

src/pagination.js

@@ -1,34 +1,51 @@
-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 (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()
     const page = this.state.page
     this.changePage(page === '' ? this.props.page : page)
-  },
+  }
+
   render () {
     const {
       // Computed
@@ -44,7 +61,7 @@ export default React.createClass({
       onPageSizeChange,
       className,
       PreviousComponent = defaultButton,
-      NextComponent = defaultButton
+      NextComponent = defaultButton,
     } = this.props
 
     return (
@@ -54,7 +71,7 @@ export default React.createClass({
       >
         <div className='-previous'>
           <PreviousComponent
-            onClick={(e) => {
+            onClick={e => {
               if (!canPrevious) return
               this.changePage(page - 1)
             }}
@@ -65,50 +82,53 @@ export default React.createClass({
         </div>
         <div className='-center'>
           <span className='-pageInfo'>
-            {this.props.pageText} {showPageJump ? (
-              <form className='-pageJump'
-                onSubmit={this.applyPage}
-              >
+            {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>
-            ) : (
-              <span className='-currentPage'>{page + 1}</span>
-            )} {this.props.ofText} <span className='-totalPages'>{pages}</span>
+              </div>
+              : <span className='-currentPage'>
+                {page + 1}
+              </span>}{' '}
+            {this.props.ofText}{' '}
+            <span className='-totalPages'>{pages || 1}</span>
           </span>
-          {showPageSizeOptions && (
+          {showPageSizeOptions &&
             <span className='select-wrap -pageSizeOptions'>
               <select
-                onChange={(e) => onPageSizeChange(Number(e.target.value))}
+                onChange={e => onPageSizeChange(Number(e.target.value))}
                 value={pageSize}
               >
                 {pageSizeOptions.map((option, i) => {
                   return (
-                    <option
-                      key={i}
-                      value={option}>
+                    <option key={i} value={option}>
                       {option} {this.props.rowsText}
                     </option>
                   )
                 })}
               </select>
-            </span>
-          )}
+            </span>}
         </div>
         <div className='-next'>
           <NextComponent
-            onClick={(e) => {
+            onClick={e => {
               if (!canNext) return
               this.changePage(page + 1)
             }}
@@ -120,4 +140,4 @@ export default React.createClass({
       </div>
     )
   }
-})
+}

src/utils.js

@@ -15,7 +15,11 @@ export default {
   makeTemplateComponent,
   groupBy,
   isArray,
-  splitProps
+  splitProps,
+  compactObject,
+  isSortingDesc,
+  normalizeComponent,
+  asPx,
 }
 
 function get (obj, path, def) {
@@ -61,23 +65,20 @@ function range (n) {
   return arr
 }
 
-function orderBy (arr, funcs, dirs) {
-  return arr.sort((a, b) => {
+function orderBy (arr, funcs, dirs, indexKey) {
+  return arr.sort((rowA, rowB) => {
     for (let i = 0; i < funcs.length; i++) {
       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
       }
     }
+    // Use the row index for tie breakers
     return dirs[0]
-      ? a.__index - b.__index
-      : b.__index - b.__index
+      ? rowA[indexKey] - rowB[indexKey]
+      : rowB[indexKey] - rowA[indexKey]
   })
 }
 
@@ -94,12 +95,14 @@ 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
   }
@@ -119,15 +122,16 @@ function sum (arr) {
   }, 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>
-  )
+  cmp.displayName = displayName
+  return cmp
 }
 
 function groupBy (xs, key) {
@@ -139,6 +143,11 @@ function groupBy (xs, key) {
   }, {})
 }
 
+function asPx (value) {
+  value = Number(value)
+  return Number.isNaN(value) ? null : value + 'px'
+}
+
 function isArray (a) {
   return Array.isArray(a)
 }
@@ -149,10 +158,10 @@ function isArray (a) {
 
 function makePathArray (obj) {
   return flattenDeep(obj)
-      .join('.')
-      .replace('[', '.')
-      .replace(']', '')
-      .split('.')
+    .join('.')
+    .replace(/\[/g, '.')
+    .replace(/\]/g, '')
+    .split('.')
 }
 
 function flattenDeep (arr, newArr = []) {
@@ -166,10 +175,36 @@ function flattenDeep (arr, newArr = []) {
   return newArr
 }
 
-function splitProps ({className, style, ...rest}) {
+function splitProps ({ className, style, ...rest }) {
   return {
     className,
     style,
-    rest
+    rest: rest || {},
   }
 }
+
+function compactObject (obj) {
+  const newObj = {}
+  for (var key in obj) {
+    if (
+      obj.hasOwnProperty(key) &&
+      obj[key] !== undefined &&
+      typeof obj[key] !== 'undefined'
+    ) {
+      newObj[key] = obj[key]
+    }
+  }
+  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
+}

stories/CellRenderers.js

@@ -1,170 +0,0 @@
-import React from 'react'
-import _ from 'lodash'
-import namor from 'namor'
-
-import CodeHighlight from './components/codeHighlight'
-import ReactTable from '../src/index'
-
-export default () => {
-  const data = _.map(_.range(5553), d => {
-    const statusChance = Math.random()
-    return {
-      firstName: namor.generate({ words: 1, numLen: 0 }),
-      lastName: namor.generate({ words: 1, numLen: 0 }),
-      progress: Math.floor(Math.random() * 100),
-      status: statusChance > 0.66 ? 'relationship'
-        : statusChance > 0.33 ? 'complicated'
-        : 'single'
-    }
-  })
-
-  const columns = [{
-    header: 'Name',
-    columns: [{
-      header: 'First Name',
-      accessor: 'firstName'
-    }, {
-      header: 'Last Name',
-      id: 'lastName',
-      accessor: d => d.lastName
-    }]
-  }, {
-    header: 'Info',
-    columns: [{
-      header: 'Profile Progress',
-      accessor: 'progress',
-      render: row => (
-        <div
-          style={{
-            width: '100%',
-            height: '100%',
-            backgroundColor: '#dadada',
-            borderRadius: '2px'
-          }}
-        >
-          <div
-            style={{
-              width: `${row.value}%`,
-              height: '100%',
-              backgroundColor: row.value > 66 ? '#85cc00'
-                : row.value > 33 ? '#ffbf00'
-                : '#ff2e00',
-              borderRadius: '2px',
-              transition: 'all .2s ease-out'
-            }}
-          />
-        </div>
-      )
-    }, {
-      header: 'Status',
-      accessor: 'status',
-      render: row => (
-        <span>
-          <span style={{
-            color: row.value === 'relationship' ? '#ff2e00'
-              : row.value === 'complicated' ? '#ffbf00'
-              : '#57d500',
-            transition: 'all .3s ease'
-          }}>
-            &#x25cf;
-          </span> {
-            row.value === 'relationship' ? 'In a relationship'
-            : row.value === 'complicated' ? `It's complicated`
-            : 'Single'
-          }
-        </span>
-      )
-    }]
-  }]
-
-  return (
-    <div>
-      <div className='table-wrap'>
-        <ReactTable
-          className='-striped -highlight'
-          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'
-
-const columns = [{
-  header: 'Name',
-  columns: [{
-    header: 'First Name',
-    accessor: 'firstName'
-  }, {
-    header: 'Last Name',
-    id: 'lastName',
-    accessor: d => d.lastName
-  }]
-}, {
-  header: 'Info',
-  columns: [{
-    header: 'Profile Progress',
-    accessor: 'progress',
-    render: row => (
-      <div
-        style={{
-          width: '100%',
-          height: '100%',
-          backgroundColor: '#dadada',
-          borderRadius: '2px'
-        }}
-      >
-        <div
-          style={{
-            width: \`$\{row.value}%\`,
-            height: '100%',
-            backgroundColor: row.value > 66 ? '#85cc00'
-              : row.value > 33 ? '#ffbf00'
-              : '#ff2e00',
-            borderRadius: '2px',
-            transition: 'all .2s ease-out'
-          }}
-        />
-      </div>
-    )
-  }, {
-    header: 'Status',
-    accessor: 'status',
-    render: row => (
-      <span>
-        <span style={{
-          color: row.value === 'relationship' ? '#ff2e00'
-            : row.value === 'complicated' ? '#ffbf00'
-            : '#57d500',
-          transition: 'all .3s ease'
-        }}>
-          &#x25cf;
-        </span> {
-          row.value === 'relationship' ? 'In a relationship'
-          : row.value === 'complicated' ? \`It's complicated\`
-          : 'Single'
-        }
-      </span>
-    )
-  }]
-}]
-
-return (
-  <ReactTable
-    data={data}
-    columns={columns}
-    defaultPageSize={10}
-  />
-)
-  `
-}

stories/CustomComponentProps.js

@@ -1,86 +0,0 @@
-import React from 'react'
-import _ from 'lodash'
-import namor from 'namor'
-
-import CodeHighlight from './components/codeHighlight'
-import ReactTable from '../src/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
-          className='-striped -highlight'
-          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}
-  />
-)
-  `
-}

stories/CustomExpanderPosition.js

@@ -1,107 +0,0 @@
-import React from 'react'
-import _ from 'lodash'
-import namor from 'namor'
-
-import CodeHighlight from './components/codeHighlight'
-import ReactTable from '../src/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',
-      render: row => {
-        return <span>{row.aggregated ? '...' : row.value}</span>
-      }
-    }, {
-      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>
-      }
-    }]
-  }, {
-    expander: true
-  }]
-
-  return (
-    <div>
-      <div className='table-wrap'>
-        <ReactTable
-          className='-striped -highlight'
-          data={data}
-          columns={columns}
-          defaultPageSize={10}
-          SubComponent={() => <span>Hello</span>}
-        />
-      </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',
-    render: row => {
-      return <span>{row.aggregated ? '...' : row.value}</span>
-    }
-  }, {
-    header: 'Last Name',
-    id: 'lastName',
-    accessor: d => d.lastName
-  }]
-}, {
-  expander: true
-}, {
-  header: 'Info',
-  columns: [{
-    header: 'Age',
-    accessor: 'age',
-    aggregate: vals => _.round(_.mean(vals)),
-    render: row => {
-      return <span>{row.aggregated ? \`$\{row.value} (avg)\` : row.value}</span>
-    }
-  }]
-}]
-
-return (
-  <ReactTable
-    className='-striped -highlight'
-    data={data}
-    columns={columns}
-    defaultPageSize={10}
-    SubComponent={() => <span>Hello</span>}
-    pivotBy={['lastName']}
-  />
-)
-  `
-}

stories/CustomWidths.js

@@ -1,91 +0,0 @@
-import React from 'react'
-import _ from 'lodash'
-import namor from 'namor'
-
-import CodeHighlight from './components/codeHighlight'
-import ReactTable from '../src/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',
-      maxWidth: 200
-    }, {
-      header: 'Last Name',
-      id: 'lastName',
-      accessor: d => d.lastName,
-      width: 300
-    }]
-  }, {
-    header: 'Info',
-    columns: [{
-      header: 'Age',
-      accessor: 'age',
-      minWidth: 400
-    }]
-  }]
-
-  return (
-    <div>
-      <div className='table-wrap'>
-        <ReactTable
-          className='-striped -highlight'
-          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'
-
-const columns = [{
-  header: 'Name',
-  columns: [{
-    header: 'First Name',
-    accessor: 'firstName',
-    maxWidth: 200
-  }, {
-    header: 'Last Name',
-    id: 'lastName',
-    accessor: d => d.lastName,
-    width: 300
-  }]
-}, {
-  header: 'Info',
-  columns: [{
-    header: 'Age',
-    accessor: 'age',
-    minWidth: 400
-  }]
-}]
-
-return (
-  <ReactTable
-    className='-striped -highlight'
-    data={data}
-    columns={columns}
-    defaultPageSize={10}
-  />
-)
-  `
-}

stories/DefaultSorting.js

@@ -1,87 +0,0 @@
-import React from 'react'
-import _ from 'lodash'
-import namor from 'namor'
-
-import CodeHighlight from './components/codeHighlight'
-import ReactTable from '../src/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',
-      sort: 'desc'
-    }]
-  }]
-
-  return (
-    <div>
-      <div className='table-wrap'>
-        <ReactTable
-          className='-striped -highlight'
-          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}
-  />
-)
-  `
-}

stories/FunctionalRendering.js

@@ -1,140 +0,0 @@
-import React from 'react'
-import _ from 'lodash'
-import namor from 'namor'
-import JSONTree from 'react-json-tree'
-
-import CodeHighlight from './components/codeHighlight'
-import ReactTable from '../src/index'
-
-const JSONtheme = {
-  scheme: 'monokai',
-  author: 'wimer hazenberg (http://www.monokai.nl)',
-  base00: '#272822',
-  base01: '#383830',
-  base02: '#49483e',
-  base03: '#75715e',
-  base04: '#a59f85',
-  base05: '#f8f8f2',
-  base06: '#f5f4f1',
-  base07: '#f9f8f5',
-  base08: '#f92672',
-  base09: '#fd971f',
-  base0A: '#f4bf75',
-  base0B: '#a6e22e',
-  base0C: '#a1efe4',
-  base0D: '#66d9ef',
-  base0E: '#ae81ff',
-  base0F: '#cc6633'
-}
-
-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
-          className='-striped -highlight'
-          data={data}
-          columns={columns}
-          defaultPageSize={10}
-        >
-          {(state, makeTable, instance) => {
-            console.log(state)
-            return (
-              <div>
-                Look! This is the entire table state and component instance at your disposal!
-                <JSONTree
-                  data={Object.assign({}, state, {children: 'function () {...}'})}
-                  theme={JSONtheme}
-                  invertTheme
-                />
-                <br />
-                <br />
-                {makeTable()}
-              </div>
-            )
-          }}
-        </ReactTable>
-      </div>
-      <br />
-      <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
-    className='-striped -highlight'
-    data={data}
-    columns={columns}
-    defaultPageSize={10}
-  >
-    {(state, makeTable, instance) => {
-      console.log(state)
-      return (
-        <div>
-          Look! This is the entire table state and component instance at your disposal!
-          <JSONTree
-            data={Object.assign({}, state, {children: 'function () {...}'})}
-            theme={JSONtheme}
-            invertTheme
-          />
-          <br />
-          <br />
-          {makeTable()}
-        </div>
-      )
-    }}
-  </ReactTable>
-)
-  `
-}

stories/OneHundredKRows.js

@@ -1,139 +0,0 @@
-import React from 'react'
-import _ from 'lodash'
-import namor from 'namor'
-
-import CodeHighlight from './components/codeHighlight'
-import ReactTable from '../src/index'
-
-export default () => {
-  const data = _.map(_.range(100000), 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}
-          className='-striped -highlight'
-          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>
-      )
-    }}
-  />
-)
-  `
-}

stories/Pivoting.js

@@ -1,121 +0,0 @@
-import React from 'react'
-import _ from 'lodash'
-import namor from 'namor'
-
-import CodeHighlight from './components/codeHighlight'
-import ReactTable from '../src/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}
-          className='-striped -highlight'
-          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>
-      )
-    }}
-  />
-)
-  `
-}

stories/PivotingSubComponents.js

@@ -1,139 +0,0 @@
-import React from 'react'
-import _ from 'lodash'
-import namor from 'namor'
-
-import CodeHighlight from './components/codeHighlight'
-import ReactTable from '../src/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}
-          className='-striped -highlight'
-          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>
-      )
-    }}
-  />
-)
-  `
-}

stories/ServerSide.js

@@ -1,162 +0,0 @@
-import React from 'react'
-import _ from 'lodash'
-import namor from 'namor'
-
-import CodeHighlight from './components/codeHighlight'
-import ReactTable from '../src/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
-            className='-striped -highlight'
-            columns={[{
-              header: 'First Name',
-              accessor: 'firstName'
-            }, {
-              header: 'Last Name',
-              id: 'lastName',
-              accessor: d => d.lastName
-            }, {
-              header: 'Age',
-              accessor: 'age'
-            }]}
-            manual // Forces table not to paginate or sort automatically, so we can handle it server-side
-            defaultPageSize={10}
-            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 () {
-    return (
-      <ReactTable
-        columns={[{
-          header: 'First Name',
-          accessor: 'firstName'
-        }, {
-          header: 'Last Name',
-          id: 'lastName',
-          accessor: d => d.lastName
-        }, {
-          header: 'Age',
-          accessor: 'age'
-        }]}
-        manual // Forces table not to paginate or sort automatically, so we can handle it server-side
-        defaultPageSize={10}
-        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
-      />
-  }
-})
-  `
-}

stories/Simple.js

@@ -1,86 +0,0 @@
-import React from 'react'
-import _ from 'lodash'
-import namor from 'namor'
-
-import CodeHighlight from './components/codeHighlight'
-import ReactTable from '../src/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
-          className='-striped -highlight'
-          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}
-  />
-)
-  `
-}

stories/SubComponents.js

@@ -1,128 +0,0 @@
-import React from 'react'
-import _ from 'lodash'
-import namor from 'namor'
-
-import CodeHighlight from './components/codeHighlight'
-import ReactTable from '../src/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
-          className='-striped -highlight'
-          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>
-      )
-    }}
-  />
-)
-  `
-}

stories/components/codeHighlight.js

@@ -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()
-  }
-})

umd.webpack.js

@@ -0,0 +1,20 @@
+const webpack = require('webpack')
+module.exports = {
+  entry: './lib/index.js',
+  output: {
+    filename: './react-table.js',
+    libraryTarget: 'umd',
+    library: 'ReactTable'
+  },
+  externals: {
+    react: {
+      root: 'React',
+      commonjs2: 'react',
+      commonjs: 'react',
+      amd: 'react'
+    }
+  },
+  plugins: [
+    new webpack.optimize.UglifyJsPlugin()
+  ]
+}