5.1.0

Fixes #69

.gitignore

@@ -3,6 +3,3 @@ lib/
 react-table.js
 react-table.css
 *.log
-example/dist/
-
-storybook-static

.storybook/CNAME

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

.storybook/config.js

@@ -11,11 +11,17 @@ 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')
@@ -31,10 +37,16 @@ configure(() => {
       return <ReadmeCmp />
     })
   storiesOf('2. Demos')
-    .add('Client-side Data', Simple)
+    .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)

README.md

@@ -1,5 +1,5 @@
 <div align="center">
-  <a href="https://github.com/tannerlinsley/react-table"><img src="https://github.com/tannerlinsley/react-table/raw/master/media/Banner.png" alt="React Table Logo" style="width:450px;"/></a>
+  <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 />
 
@@ -8,7 +8,22 @@
 # React Table
 `react-table` is a **lightweight, fast and extendable datagrid** built for React
 
-[![Build Status](https://travis-ci.org/tannerlinsley/react-table.svg?branch=master)](https://travis-ci.org/tannerlinsley/react-table) [![npm](https://img.shields.io/npm/dm/react-table.svg)](https://npmjs.com/packag/react-table) [![react-table on Slack](https://img.shields.io/badge/slack-react--table-blue.svg)](https://react-table-slack.herokuapp.com/) [![GitHub stars](https://img.shields.io/github/stars/tannerlinsley/react-table.svg?style=social&label=Star)](https://github.com/tannerlinsley/react-table) [![Twitter Follow](https://img.shields.io/twitter/follow/tannerlinsley.svg?style=social&label=Follow)](https://twitter.com/tannerlinsley)
+
+<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>
+<a href="https://npmjs.com/package/react-table" target="\_parent">
+  <img alt="" src="https://img.shields.io/npm/dm/react-table.svg" />
+</a>
+<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>
+<a href="https://twitter.com/tannerlinsley" target="\_parent">
+  <img alt="" src="https://img.shields.io/twitter/follow/tannerlinsley.svg?style=social&label=Follow" />
+</a>
 
 ## Features
 
@@ -18,9 +33,9 @@
 - Column 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="\_blank">"Why I wrote React Table and the problems it has solved for Nozzle.io</a> by Tanner Linsley
+- <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.zabapps.com/?selectedKind=2.%20Demos&selectedStory=Client-side%20Data&full=0&down=1&left=1&panelRight=0&downPanel=kadirahq%2Fstorybook-addon-actions%2Factions-panel" target="\_blank">Demo</a>
+## <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>
 
 ## Table of Contents
 - [Installation](#installation)
@@ -28,19 +43,44 @@
 - [Data](#data)
 - [Props](#props)
 - [Columns](#columns)
+- [Column Header Groups](#column-header-groups)
+- [Custom Cell & Header Rendering](#custom-cell--and-header-rendering)
 - [Styles](#styles)
-- [Header Groups](#header-groups)
-- [Pivoting & Aggregation](#pivoting-aggregation)
-- [Sub Tables & Sub Components](#sub-tables-sub-components)
+- [Custom Props](#custom-props)
+- [Pivoting & Aggregation](#pivoting--aggregation)
+- [Sub Tables & Sub Components](#sub-tables--sub-components)
 - [Server-side Data](#server-side-data)
 - [Fully Controlled Component](#fully-controlled-component)
-- [Multi-sort](#multi-sort)
+- [Functional Rendering](#functional-rendering)
+- [Multi-Sort](#multi-sort)
 - [Component Overrides](#component-overrides)
+- [Contributing](#contributing)
+- [Scripts](#scripts)
+- [Used By](#used-by)
+
 
 ## Installation
+1. Install React Table as a dependency
 ```bash
 $ npm install react-table
+# or
+$ yarn add react-table
 ```
+2. Import the `react-table` module
+```javascript
+// ES6
+import ReactTable from 'react-table'
+// ES5
+var ReactTable = require('react-table').default
+```
+3. Import styles by including `react-table.css` anywhere on the page
+```javascript
+// JS (Webpack)
+import 'react-table/react-table.css'
+// html
+<link rel="stylesheet" href="node_modules/react-table/react-table.css">
+```
+
 
 ## Example
 ```javascript
@@ -63,7 +103,7 @@ const columns = [{
 }, {
   header: 'Age',
   accessor: 'age',
-  render: props => <span className='number'>props.value</span> // Custom cell components!
+  render: props => <span className='number'>{props.value}</span> // Custom cell components!
 }, {
   header: 'Friend Name',
   accessor: d => d.friend.name // Custom value accessors!
@@ -87,55 +127,91 @@ These are all of the available props (and their default values) for the main `<R
 ```javascript
 {
   // General
-  loading: false, // Whether to show the loading overlay or not
-  defaultPageSize: 20, // The default page size (this can be changed by the user if `showPageSizeOptions` is enabled)
-  minRows: 0, // Ensure this many rows are always rendered, regardless of rows on page
-  showPagination: true, // Shows or hides the pagination component
-  showPageJump: true, // Shows or hides the pagination number input
-  showPageSizeOptions: true, // Enables the user to change the page size
-  pageSizeOptions: [5, 10, 20, 25, 50, 100], // The available page size options
-  expanderColumnWidth: 30, // default columnWidth for the expander column
+  data: [],
+  loading: false,
+  showPagination: true,
+  showPageSizeOptions: true,
+  pageSizeOptions: [5, 10, 20, 25, 50, 100],
+  defaultPageSize: 20,
+  showPageJump: true,
+  expanderColumnWidth: 35,
+  collapseOnSortingChange: false,
+  collapseOnPageChange: true,
+  freezeWhenExpanded: false,
+  defaultSorting: [],
 
-  // Callbacks
-  onChange: (state, instance) => null, // Anytime the internal state of the table changes, this will fire
-  onTrClick: (row, event) => null,  // Handler for row click events
+  // Controlled State Overrides (see Fully Controlled Component section)
+  page: undefined,
+  pageSize: undefined,
+  sorting: undefined
+
+  // Controlled State Callbacks
+  onExpandSubComponent: undefined,
+  onPageChange: undefined,
+  onPageSizeChange: undefined,
+  onSortingChange: undefined,
+
+  // Pivoting
+  pivotBy: undefined,
+  pivotColumnWidth: 200,
+  pivotValKey: '_pivotVal',
+  pivotIDKey: '_pivotID',
+  subRowsKey: '_subRows',
+
+  // Pivoting State Overrides (see Fully Controlled Component section)
+  expandedRows: {},
+
+  // Pivoting State Callbacks
+  onExpandRow: undefined,
+
+  // General Callbacks
+  onChange: () => null,
+
+  // Classes
+  className: '',
+  style: {},
+
+  // Component decorators
+  getProps: () => ({}),
+  getTableProps: () => ({}),
+  getTheadGroupProps: () => ({}),
+  getTheadGroupTrProps: () => ({}),
+  getTheadGroupThProps: () => ({}),
+  getTheadProps: () => ({}),
+  getTheadTrProps: () => ({}),
+  getTheadThProps: () => ({}),
+  getTbodyProps: () => ({}),
+  getTrGroupProps: () => ({}),
+  getTrProps: () => ({}),
+  getThProps: () => ({}),
+  getTdProps: () => ({}),
+  getPaginationProps: () => ({}),
+  getLoadingProps: () => ({}),
+
+  // Global Column Defaults
+  column: {
+    sortable: true,
+    show: true,
+    minWidth: 100,
+    // Cells only
+    render: undefined,
+    className: '',
+    style: {},
+    getProps: () => ({}),
+    // Headers only
+    header: undefined,
+    headerClassName: '',
+    headerStyle: {},
+    getHeaderProps: () => ({})
+  },
 
   // Text
   previousText: 'Previous',
   nextText: 'Next',
+  loadingText: 'Loading...',
   pageText: 'Page',
   ofText: 'of',
   rowsText: 'rows',
-
-  // Classes
-  className: '-striped -highlight', // The most top level className for the component
-  tableClassName: '', // ClassName for the `table` element
-  theadClassName: '', // ClassName for the `thead` element
-  tbodyClassName: '', // ClassName for the `tbody` element
-  trClassName: '', // ClassName for all `tr` elements
-  trClassCallback: row => null, // A call back to dynamically add classes (via the classnames module) to a row element
-  paginationClassName: '' // ClassName for `pagination` element
-
-  // Styles
-  style: {}, // Main style object for the component
-  tableStyle: {}, // style object for the `table` component
-  theadStyle: {}, // style object for the `thead` component
-  tbodyStyle: {}, // style object for the `tbody` component
-  trStyle: {}, // style object for the `tr` component
-  trStyleCallback: row => {}, // A call back to dynamically add styles to a row element
-  thStyle: {}, // style object for the `th` component
-  tdStyle: {}, // style object for the `td` component
-  paginationStyle: {}, // style object for the `paginination` component
-
-  // Controlled Props (see Using as a Fully Controlled Component below)
-  page: undefined,
-  pageSize: undefined,
-  sorting: undefined,
-  expandedRows: undefined,
-  // Controlled Callbacks
-  onExpandRow: undefined,
-  onPageChange: undefined,
-  onPageSizeChange: undefined,
 }
 ```
 
@@ -151,7 +227,7 @@ Object.assign(ReactTableDefaults, {
 })
 ```
 
-Or just define them on the component per-instance
+Or just define them as props
 
 ```javascript
 <ReactTable
@@ -170,14 +246,19 @@ Or just define them on the component per-instance
   accessor: 'propertyName' or Accessor eg. (row) => row.propertyName,
   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
   show: true, // can be used to hide a column
-  minWidth: 100 // A minimum width for this column. If there is room, columns will flex to fill available space
+  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.
+
+  // Special
+  expander: false // This option will override all data-related options and designates the column to be used
+  // for pivoting and sub-component expansion
 
   // 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. ({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
+  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
@@ -195,14 +276,12 @@ Or just define them on the component per-instance
 }]
 ```
 
-## Styles
-React-table is built to be dropped into existing applications or styled from the ground up, but if you'd like a decent starting point, you can optionally include our default theme `react-table.css`.  We think it looks great, honestly :)
-
-## Header Groups
-To group columns with another header column, just nest your columns in a header column like so:
+## 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',
+  headerClassName: 'my-favorites-column-header-group'
   columns: [{
     header: 'Color',
     accessor: 'favorites.color'
@@ -216,6 +295,148 @@ const columns = [{
 }]
 ```
 
+## 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:
+- `row` - Original row from your data
+- `rowValues` - 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)
+- `nestingPath` - The nesting path of the row
+- `aggregated` - A boolean stating if the row is an aggregation row
+- `subRows` - An array of any expandable sub-rows contained in this row
+
+```javascript
+// 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>,
+  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>
+  )
+}]
+```
+
+## 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`.
+
+#### Built-in Styles
+- 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
+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.
+
+## Custom Props
+
+#### Built-in Components
+Every single built-in component's props can be dynamically extended using any one of these prop-callbacks:
+```javascript
+<ReactTable
+  getProps={fn}
+  getTableProps={fn}
+  getTheadGroupProps={fn}
+  getTheadGroupTrProps={fn}
+  getTheadGroupThProps={fn}
+  getTheadProps={fn}
+  getTheadTrProps={fn}
+  getTheadThProps={fn}
+  getTbodyProps={fn}
+  getTrGroupProps={fn}
+  getTrProps={fn}
+  getThProps={fn}
+  getTdProps={fn}
+  getPaginationProps={fn}
+  getLoadingProps={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
+
+This makes it extremely easy to add, say... a row click callback!
+```javascript
+// When any Td element is clicked, we'll log out some information
+<ReactTable
+  getTdProps={(state, rowInfo, column, instance) => {
+    return {
+      onClick: e => {
+        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)
+      }
+    }
+  }}
+/>
+```
+
+You can use these callbacks for dynamic styling as well!
+```javascript
+// Any Tr element will be green if its (row.age > 20)
+<ReactTable
+  getTrProps={(state, rowInfo, column) => {
+    return {
+      style: {
+        background: rowInfo.age > 20 ? 'green' : 'red'
+      }
+    }
+  }}
+/>
+```
+
+#### Column Components
+Just as core components can have dynamic props, columns and column headers can too!
+
+You can utilize either of these prop callbacks on columns:
+```javascript
+const columns = [{
+  getHeaderProps: () => (...),
+  getProps: () => (...)
+}]
+```
+
+In a similar fashion these can be used to dynamically style just about anything!
+```javascript
+// This columns cells will be red if (row.name === Santa Clause)
+const columns = [{
+  getProps: (state, rowInfo, column) => {
+    return {
+      style: {
+        background: rowInfo.name === 'Santa Clause' ? 'red' : null
+      }
+    }
+  }
+}]
+```
+
 ## Pivoting & 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.
@@ -302,7 +523,7 @@ If you want to handle pagination, and sorting on the server, `react-table` makes
 />
 ```
 
-For a detailed example, take a peek at our [async table mockup](https://github.com/tannerlinsley/react-table/blob/master/example/src/screens/async.js)
+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>
 
 ## 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.
@@ -337,6 +558,52 @@ Here are the props and their corresponding callbacks that control the state of t
 />
 ```
 
+## 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 />`.
+
+The function you pass will be called with the following items:
+- Fully-resolved state of the table
+- The standard table generator
+- 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
+
+Example:
+```javascript
+<ReactTable
+  columns={columns}
+  data={data}
+  ...
+>
+  {(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 />
+        {makeTable()}
+      </div>
+    )
+
+    // The possibilities are endless!!!
+
+  }}
+</ReactTable>
+```
+
 ## 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!
 
@@ -368,7 +635,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 [the source](https://github.com/tannerlinsley/react-table/blob/master/src/index.js) 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/tannerlinsley/react-table/blob/master/src/index.js" target="\_parent">the source</a> for the component you wish to replace.
 
 
 ## Contributing
@@ -376,23 +643,22 @@ 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
-- `npm install`
-- `npm run watch`
+- `$ yarn`
+- `$ yarn run storybook`
 - 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
 - Submit PR for review
 
-If you would like to preview your changes, you can link and utilize the example like so:
+#### Scripts
 
-- `npm link`
-- `cd example`
-- `npm install`
-- `npm link react-table`
-- `npm run watch`
-- Make changes to the example in `src/screens/index.js` if needed
-- View changes at `localhost:8000`
+- `$ yarn run storybook` 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
 
-<a href='https://nozzle.io'>
+<a href='https://nozzle.io' target="\_parent">
   <img src='https://nozzle.io/img/logo-blue.png' alt='Nozzle Logo' style='width:300px;'/>
 </a>

docs/CNAME

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

docs/iframe.html

@@ -0,0 +1,22 @@
+
+    <!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.2624d4fc5e8e37cbc8cc.bundle.js"></script>
+      </body>
+    </html>
+  

docs/index.html

@@ -0,0 +1,44 @@
+
+    <!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/static/manager.f127c5ae855df8d8558a.bundle.js.map

@@ -0,0 +1 @@
+{"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.2624d4fc5e8e37cbc8cc.bundle.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"static/preview.2624d4fc5e8e37cbc8cc.bundle.js","sources":["webpack:///static/preview.2624d4fc5e8e37cbc8cc.bundle.js"],"mappings":"AAAA;AAkuDA;AAkyDA;AA01EA;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;AAwsFA;AAyiGA;AA++CA;AA8yCA;AAgzCA;AAwhDA;AAiPA;AA+jFA","sourceRoot":""}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-table",
-  "version": "4.2.3",
+  "version": "5.1.0",
   "description": "A fast, lightweight, opinionated table and datagrid built on React",
   "license": "MIT",
   "homepage": "https://github.com/tannerlinsley/react-table#readme",
@@ -24,7 +24,8 @@
   ],
   "scripts": {
     "build:node": "babel src --out-dir lib --source-maps inline",
-    "build:css": "rm -rf react-table.css && stylus src/index.styl --use ./node_modules/nib/lib/nib.js --compress -o react-table.css",
+    "build:css": "rm -rf 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",
@@ -32,7 +33,7 @@
     "umd": "rm -rf react-table.js && browserify lib/index.js -s reactTable -x react -t babelify -g uglifyify -o react-table.js",
     "prepublish": "npm-run-all build:* && npm run umd",
     "storybook": "start-storybook -p 8000 -c .storybook",
-    "deploy": "build-storybook && zab deploy"
+    "docs": "build-storybook -o docs && cp .storybook/CNAME docs/CNAME"
   },
   "dependencies": {
     "classnames": "^2.2.5"
@@ -42,6 +43,7 @@
   },
   "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",
@@ -53,12 +55,14 @@
     "html-loader": "^0.4.4",
     "markdown-loader": "^0.1.7",
     "namor": "^0.3.0",
-    "nib": "^1.1.2",
     "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",
+    "storybook": "^0.0.0",
     "stylus": "^0.54.5",
     "uglifyify": "3.0.3"
   },
@@ -73,7 +77,8 @@
       "lib",
       "example",
       "react-table.js",
-      "stories"
+      "stories",
+      "docs"
     ]
   },
   "babel": {

src/componentMethods.js

@@ -0,0 +1,396 @@
+import _ from './utils'
+
+export default {
+  getDataModel (nextProps, nextState) {
+    const {
+      columns,
+      pivotBy = [],
+      data,
+      pivotIDKey,
+      pivotValKey,
+      subRowsKey,
+      expanderColumnWidth,
+      SubComponent,
+      page,
+      pageSize
+    } = 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)
+    }
+
+    const newPages = Math.ceil(resolvedData.length / pageSize)
+
+    return {
+      resolvedData,
+      pivotColumn,
+      allVisibleColumns,
+      headerGroups,
+      allDecoratedColumns,
+      hasHeaderGroups,
+      page: (page + 1) > newPages ? newPages - 1 : page
+    }
+  },
+  getSortedData (resolvedState) {
+    const {
+      manual,
+      sorting,
+      resolvedData
+    } = resolvedState
+
+    // Resolve the data from either manual data or sorted data
+    return {
+      sortedData: manual ? resolvedData : this.sortData(resolvedData, sorting)
+    }
+  },
+
+  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])
+  },
+  sortData (data, sorting) {
+    if (!sorting.length) {
+      return data
+    }
+    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.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 || []).map(d => {
+      d.desc = _.isSortingDesc(d)
+      return d
+    })
+    if (!_.isArray(column)) {
+      // Single-Sort
+      const existingIndex = newSorting.findIndex(d => d.id === column.id)
+      if (existingIndex > -1) {
+        const existing = newSorting[existingIndex]
+        if (existing.desc) {
+          if (additive) {
+            newSorting.splice(existingIndex, 1)
+          } else {
+            existing.desc = false
+            newSorting = [existing]
+          }
+        } else {
+          existing.desc = true
+          if (!additive) {
+            newSorting = [existing]
+          }
+        }
+      } else {
+        if (additive) {
+          newSorting.push({
+            id: column.id,
+            desc: false
+          })
+        } else {
+          newSorting = [{
+            id: column.id,
+            desc: false
+          }]
+        }
+      }
+    } else {
+      // Multi-Sort
+      const existingIndex = newSorting.findIndex(d => d.id === column[0].id)
+      // Existing Sorted Column
+      if (existingIndex > -1) {
+        const existing = newSorting[existingIndex]
+        if (existing.desc) {
+          if (additive) {
+            newSorting.splice(existingIndex, column.length)
+          } else {
+            column.forEach((d, i) => {
+              newSorting[existingIndex + i].desc = false
+            })
+          }
+        } else {
+          column.forEach((d, i) => {
+            newSorting[existingIndex + i].desc = true
+          })
+        }
+        if (!additive) {
+          newSorting = newSorting.slice(existingIndex, column.length)
+        }
+      } else {
+        // New Sort Column
+        if (additive) {
+          newSorting = newSorting.concat(column.map(d => ({
+            id: d.id,
+            desc: false
+          })))
+        } else {
+          newSorting = column.map(d => ({
+            id: d.id,
+            desc: false
+          }))
+        }
+      }
+    }
+    this.setStateWithData({
+      page: ((!sorting.length && newSorting.length) || !additive) ? 0 : this.state.page,
+      sorting: newSorting
+    }, () => {
+      this.fireOnChange()
+    })
+  }
+}

src/index.styl

@@ -1,5 +1,3 @@
-@import 'nib'
-
 $easeOutQuad = cubic-bezier(0.250, 0.460, 0.450, 0.940)
 $easeOutBack = cubic-bezier(0.175,  0.885, 0.320, 1.275)
 $expandSize = 7px

src/utils.js

@@ -6,16 +6,18 @@ export default {
   set,
   takeRight,
   last,
-  sortBy,
+  orderBy,
   range,
   remove,
   clone,
   getFirstDefined,
   sum,
   makeTemplateComponent,
-  prefixAll,
   groupBy,
-  isArray
+  isArray,
+  splitProps,
+  compactObject,
+  isSortingDesc
 }
 
 function get (obj, path, def) {
@@ -61,7 +63,7 @@ function range (n) {
   return arr
 }
 
-function sortBy (arr, funcs, dirs) {
+function orderBy (arr, funcs, dirs) {
   return arr.sort((a, b) => {
     for (let i = 0; i < funcs.length; i++) {
       const comp = funcs[i]
@@ -75,7 +77,9 @@ function sortBy (arr, funcs, dirs) {
         return desc ? 1 : -1
       }
     }
-    return 0
+    return dirs[0]
+      ? a.__index - b.__index
+      : b.__index - b.__index
   })
 }
 
@@ -128,14 +132,10 @@ function makeTemplateComponent (compClass) {
   )
 }
 
-function prefixAll (obj) {
-  return obj
-}
-
 function groupBy (xs, key) {
   return xs.reduce((rv, x, i) => {
     const resKey = typeof key === 'function' ? key(x, i) : x[key]
-    rv[resKey] = rv[resKey] || []
+    rv[resKey] = isArray(rv[resKey]) ? rv[resKey] : []
     rv[resKey].push(x)
     return rv
   }, {})
@@ -167,3 +167,25 @@ function flattenDeep (arr, newArr = []) {
   }
   return newArr
 }
+
+function splitProps ({className, style, ...rest}) {
+  return {
+    className,
+    style,
+    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)
+}

stories/CellRenderers.js

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

@@ -0,0 +1,106 @@
+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>
+      <strong>Hey!</strong> Open your console! :)
+      <div className='table-wrap'>
+        <ReactTable
+          className='-striped -highlight'
+          data={data}
+          columns={columns}
+          defaultPageSize={10}
+          getTdProps={(state, rowInfo, column, instance) => {
+            return {
+              onMouseEnter: e => console.log('Cell - onMouseEnter', {
+                state,
+                rowInfo,
+                column,
+                instance,
+                event: e
+              })
+            }
+          }}
+        />
+      </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'
+  }]
+}]
+
+return (
+  <ReactTable
+    className='-striped -highlight'
+    data={data}
+    columns={columns}
+    defaultPageSize={10}
+    getTdProps={(state, rowInfo, column, instance) => {
+      return {
+        onMouseEnter: e => console.log('Cell - onMouseEnter', {
+          state,
+          rowInfo,
+          column,
+          instance,
+          event: e
+        })
+      }
+    }}
+  />
+)
+  `
+}

stories/CustomExpanderPosition.js

@@ -0,0 +1,106 @@
+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
+  }]
+}, {
+  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 (
+  <ReactTable
+    className='-striped -highlight'
+    data={data}
+    columns={columns}
+    defaultPageSize={10}
+    SubComponent={() => <span>Hello</span>}
+  />
+)
+  `
+}

stories/CustomWidths.js

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

@@ -0,0 +1,91 @@
+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}
+          defaultSorting={[{
+            id: 'age',
+            desc: 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'
+    }]
+  }]
+
+  return (
+    <ReactTable
+      className='-striped -highlight'
+      data={data}
+      columns={columns}
+      defaultPageSize={10}
+      defaultSorting={[{
+        id: 'age',
+        desc: true
+      }]}
+    />
+  )
+  `
+}

stories/FunctionalRendering.js

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

@@ -3,7 +3,7 @@ import _ from 'lodash'
 import namor from 'namor'
 
 import CodeHighlight from './components/codeHighlight'
-import ReactTable from '../lib/index'
+import ReactTable from '../src/index'
 
 export default () => {
   const data = _.map(_.range(100000), d => {
@@ -47,6 +47,7 @@ export default () => {
         <ReactTable
           data={data}
           columns={columns}
+          className='-striped -highlight'
           defaultPageSize={10}
           pivotBy={['firstName', 'lastName']}
           SubComponent={(row) => {
@@ -99,15 +100,24 @@ const columns = [{
   header: 'Info',
   columns: [{
     header: 'Age',
-    accessor: '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)
   }]
 }]
 
-export default (
+return (
   <ReactTable
     data={data}
     columns={columns}
     defaultPageSize={10}
+    className='-striped -highlight'
     pivotBy={['firstName', 'lastName']}
     SubComponent={(row) => {
       return (

stories/Pivoting.js

@@ -3,7 +3,7 @@ import _ from 'lodash'
 import namor from 'namor'
 
 import CodeHighlight from './components/codeHighlight'
-import ReactTable from '../lib/index'
+import ReactTable from '../src/index'
 
 export default () => {
   const data = _.map(_.range(10000), d => {
@@ -47,14 +47,9 @@ export default () => {
         <ReactTable
           data={data}
           columns={columns}
+          className='-striped -highlight'
           defaultPageSize={10}
           pivotBy={['firstName', 'lastName']}
-          // expandedRows={{
-          //   2: true,
-          //   3: {
-          //     2: true
-          //   }
-          // }}
         />
       </div>
       <div style={{textAlign: 'center'}}>
@@ -82,38 +77,25 @@ const columns = [{
   header: 'Info',
   columns: [{
     header: 'Age',
-    accessor: '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)
   }]
 }]
 
-export default (
+return (
   <ReactTable
     data={data}
     columns={columns}
+    className='-striped -highlight'
     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>
-      )
-    }}
+    pivotBy={['firstName', 'lastName']}
   />
 )
   `

stories/PivotingSubComponents.js

@@ -3,7 +3,7 @@ import _ from 'lodash'
 import namor from 'namor'
 
 import CodeHighlight from './components/codeHighlight'
-import ReactTable from '../lib/index'
+import ReactTable from '../src/index'
 
 export default () => {
   const data = _.map(_.range(1000), d => {
@@ -48,6 +48,7 @@ export default () => {
           data={data}
           columns={columns}
           defaultPageSize={10}
+          className='-striped -highlight'
           pivotBy={['firstName', 'lastName']}
           SubComponent={(row) => {
             return (
@@ -99,15 +100,24 @@ const columns = [{
   header: 'Info',
   columns: [{
     header: 'Age',
-    accessor: '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)
   }]
 }]
 
-export default (
+return (
   <ReactTable
     data={data}
     columns={columns}
     defaultPageSize={10}
+    className='-striped -highlight'
     pivotBy={['firstName', 'lastName']}
     SubComponent={(row) => {
       return (

stories/ServerSide.js

@@ -3,7 +3,7 @@ import _ from 'lodash'
 import namor from 'namor'
 
 import CodeHighlight from './components/codeHighlight'
-import ReactTable from '../lib/index'
+import ReactTable from '../src/index'
 
 const rawData = _.map(_.range(3424), d => {
   return {
@@ -68,22 +68,17 @@ const ServerSide = React.createClass({
       <div>
         <div className='table-wrap'>
           <ReactTable
+            className='-striped -highlight'
             columns={[{
-              header: 'Name',
-              columns: [{
-                header: 'First Name',
-                accessor: 'firstName'
-              }, {
-                header: 'Last Name',
-                id: 'lastName',
-                accessor: d => d.lastName
-              }]
+              header: 'First Name',
+              accessor: 'firstName'
             }, {
-              header: 'Info',
-              columns: [{
-                header: 'Age',
-                accessor: 'age'
-              }]
+              header: 'Last Name',
+              id: 'lastName',
+              accessor: d => d.lastName
+            }, {
+              header: 'Age',
+              accessor: 'age'
             }]}
             manual // Forces table not to paginate or sort automatically, so we can handle it server-side
             defaultPageSize={10}
@@ -141,34 +136,26 @@ export default React.createClass({
       })
   },
   render () {
-    const columns = [{
-      header: 'Name',
-      columns: [{
-        header: 'First Name',
-        accessor: 'firstName'
-      }, {
-        header: 'Last Name',
-        id: 'lastName',
-        accessor: d => d.lastName
-      }]
-    }, {
-      header: 'Info',
-      columns: [{
-        header: 'Age',
-        accessor: 'age'
-      }]
-    }]
-
     return (
       <ReactTable
-        columns={columns}
-        manual // This forces table not to paginate or sort automatically, so we can handle things server-side
+        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

@@ -3,7 +3,7 @@ import _ from 'lodash'
 import namor from 'namor'
 
 import CodeHighlight from './components/codeHighlight'
-import ReactTable from '../lib/index'
+import ReactTable from '../src/index'
 
 export default () => {
   const data = _.map(_.range(5553), d => {
@@ -36,9 +36,17 @@ export default () => {
     <div>
       <div className='table-wrap'>
         <ReactTable
+          className='-striped -highlight'
           data={data}
           columns={columns}
           defaultPageSize={10}
+          getTdProps={() => {
+            return {
+              onClick: () => {
+                console.log('clicked')
+              }
+            }
+          }}
         />
       </div>
       <div style={{textAlign: 'center'}}>

stories/SubComponents.js

@@ -3,7 +3,7 @@ import _ from 'lodash'
 import namor from 'namor'
 
 import CodeHighlight from './components/codeHighlight'
-import ReactTable from '../lib/index'
+import ReactTable from '../src/index'
 
 export default () => {
   const data = _.map(_.range(5553), d => {
@@ -36,6 +36,7 @@ export default () => {
     <div>
       <div className='table-wrap'>
         <ReactTable
+          className='-striped -highlight'
           data={data}
           columns={columns}
           defaultPageSize={10}
@@ -124,4 +125,4 @@ export default (
   />
 )
   `
-}
+}

stories/components/Logo.js

@@ -1,14 +0,0 @@
-import React from 'react'
-import banner from '../../media/Banner.png'
-
-export default () => (
-  <div>
-    <div style={{textAlign: 'center'}}>
-      <a href='https://github.com/tannerlinsley/react-table' target='_blank'>
-        <img src={banner} className='logo' />
-      </a>
-      <br />
-      <br />
-    </div>
-  </div>
-)

zab.json

@@ -1,8 +0,0 @@
-{
-  "name": "react-table",
-  "root": "storybook-static",
-  "routes": [{
-    "src": "/**",
-    "dest": "index.html"
-  }]
-}