5.0.3

Fixes #69

.gitignore

@@ -3,5 +3,3 @@ lib/
 react-table.js
 react-table.css
 *.log
-.idea
-.DS_Store

.storybook/config.js

@@ -13,7 +13,6 @@ import Readme from '../README.md'
 import Simple from '../stories/Simple.js'
 import CellRenderers from '../stories/CellRenderers.js'
 import DefaultSorting from '../stories/DefaultSorting.js'
-import CustomSorting from '../stories/CustomSorting.js'
 import CustomWidths from '../stories/CustomWidths.js'
 import CustomComponentProps from '../stories/CustomComponentProps.js'
 import ServerSide from '../stories/ServerSide.js'
@@ -23,13 +22,6 @@ import PivotingSubComponents from '../stories/PivotingSubComponents.js'
 import OneHundredKRows from '../stories/OneHundredKRows.js'
 import FunctionalRendering from '../stories/FunctionalRendering.js'
 import CustomExpanderPosition from '../stories/CustomExpanderPosition.js'
-import NoDataText from '../stories/NoDataText.js'
-import Footers from '../stories/Footers.js'
-import Filtering from '../stories/Filtering.js'
-import ControlledTable from '../stories/ControlledTable.js'
-import PivotingOptions from '../stories/PivotingOptions.js'
-import EditableTable from '../stories/EditableTable.js'
-import SubRows from '../stories/SubRows.js'
 //
 configure(() => {
   storiesOf('1. Docs')
@@ -48,7 +40,6 @@ configure(() => {
     .add('Simple Table', Simple)
     .add('Cell Renderers & Custom Components', CellRenderers)
     .add('Default Sorting', DefaultSorting)
-    .add('Custom Sorting', CustomSorting)
     .add('Custom Column Widths', CustomWidths)
     .add('Custom Component Props', CustomComponentProps)
     .add('Server-side Data', ServerSide)
@@ -56,13 +47,6 @@ configure(() => {
     .add('Pivoting & Aggregation', Pivoting)
     .add('Pivoting & Aggregation w/ Sub Components', PivotingSubComponents)
     .add('100k Rows w/ Pivoting & Sub Components', OneHundredKRows)
-    .add('Pivoting Options', PivotingOptions)
     .add('Functional Rendering', FunctionalRendering)
     .add('Custom Expander Position', CustomExpanderPosition)
-    .add('Custom "No Data" Text', NoDataText)
-    .add('Footers', Footers)
-    .add('Custom Filtering', Filtering)
-    .add('Controlled Component', ControlledTable)
-    .add('Editable table', EditableTable)
-    // .add('Sub Rows', SubRows)
 }, module)

.storybook/fonts.css

@@ -4,15 +4,3 @@ body {
   font-family: 'Open Sans', sans-serif;
   font-weight: 300;
 }
-
-h1 {
-  font-size: 24px;
-  font-weight: bold;
-  margin-bottom: 15px;
-  margin-top: 5px;
-}
-
-p {
-  margin-bottom: 15px;
-  line-height: 22px;
-}

.storybook/layout.css

@@ -1,7 +1,3 @@
 body{
 	padding: 20px;
 }
-
-strong {
-	font-weight: bold
-}

CHANGELOG.md

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

@@ -1,15 +0,0 @@
-## Problem Description
-include a detailed explanation of the problem here...
-
-## Code Snippet(s) or Codepen (http://codepen.io/tannerlinsley/pen/QpeZBa?editors=0010)
-
-## Steps to Reproduce
-1. list the steps
-2. to reproduce the issue
-
-## System Information
-* **Browser & Browser Version:**
-* **Node Version:**
-* **OS Version:**
-* **NPM Version:**
-* **Yarn Version:**

README.md

@@ -24,18 +24,9 @@
 <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>
-
-## Versions
-This document refers to version 6.x.x of react-table.
-
-Previous versions:
-
-[5.x.x Readme](https://github.com/tannerlinsley/react-table/blob/ad7d31cd3978eb45da7c6194dbab93c1e9a8594d/README.md)
 
 ## Features
+
 - Lightweight at 7kb (and just 2kb more for styles)
 - Fully customizable JSX templating
 - Supports both Client-side & Server-side pagination and multi-sorting
@@ -44,9 +35,7 @@ Previous versions:
 - 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
 
-## Demos and examples
-- <a href="http://codepen.io/tannerlinsley/pen/QpeZBa?editors=0010" target="\_blank">Codepen</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">Storybook</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)
@@ -55,16 +44,15 @@ Previous versions:
 - [Props](#props)
 - [Columns](#columns)
 - [Column Header Groups](#column-header-groups)
-- [Custom Cell and Header and Footer Rendering](#custom-cell-header-and-footer-rendering)
+- [Custom Cell & Header Rendering](#custom-cell--and-header-rendering)
 - [Styles](#styles)
 - [Custom Props](#custom-props)
-- [Pivoting and Aggregation](#pivoting-and-aggregation)
-- [Sub Tables and Sub Components](#sub-tables-and-sub-components)
+- [Pivoting & Aggregation](#pivoting--aggregation)
+- [Sub Tables & Sub Components](#sub-tables--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)
@@ -74,6 +62,8 @@ Previous versions:
 ## Installation
 1. Install React Table as a dependency
 ```bash
+$ npm install react-table
+# or
 $ yarn add react-table
 ```
 2. Import the `react-table` module
@@ -83,64 +73,49 @@ import ReactTable from 'react-table'
 // ES5
 var ReactTable = require('react-table').default
 ```
-3. Import styles by including `react-table.css`
+3. Import styles by including `react-table.css` anywhere on the page
 ```javascript
 // JS (Webpack)
 import 'react-table/react-table.css'
-// Old-school
+// html
 <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'
 
-render() {
-  const data = [{
-    name: 'Tanner Linsley',
-    age: 26,
-    friend: {
-      name: 'Jason Maurer',
-      age: 23,
-    }
-  },{
-    ...
-  }]
+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',
-    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'
-  }]
+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'
+}]
 
-  <ReactTable
-    data={data}
-    columns={columns}
-  />
-}
+<ReactTable
+  data={data}
+  columns={columns}
+/>
 ```
 
 ## Data
@@ -159,70 +134,34 @@ These are all of the available props (and their default values) for the main `<R
   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,
-  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
-  },
+  expanderColumnWidth: 35,
 
   // Controlled State Overrides (see Fully Controlled Component section)
   page: undefined,
   pageSize: undefined,
-  sorted: [],
-  filtered: [],
-  resized: [],
-  expanded: {},
+  sorting: undefined
 
   // Controlled State Callbacks
+  onExpandSubComponent: undefined,
   onPageChange: undefined,
   onPageSizeChange: undefined,
-  onSortedChange: undefined,
-  onFilteredChange: undefined,
-  onResizedChange: undefined,
-  onExpandedChange: undefined,
+  onSortingChange: undefined,
 
   // Pivoting
   pivotBy: undefined,
-  
-  // Key Constants
+  pivotColumnWidth: 200,
   pivotValKey: '_pivotVal',
   pivotIDKey: '_pivotID',
   subRowsKey: '_subRows',
-  aggregatedKey: '_aggregated',
-  nestingLevelKey: '_nestingLevel',
-  originalKey: '_original',
-  indexKey: '_index',
-  groupedByPivotKey: '_groupedByPivot',
 
-  // Server-side callbacks
-  onFetchData: () => null,
+  // Pivoting State Overrides (see Fully Controlled Component section)
+  expandedRows: {},
+
+  // Pivoting State Callbacks
+  onExpandRow: undefined,
+
+  // General Callbacks
+  onChange: () => null,
 
   // Classes
   className: '',
@@ -237,71 +176,35 @@ 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: {
-    // 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
+    sortable: true,
     show: true,
     minWidth: 100,
     // Cells only
+    render: undefined,
     className: '',
     style: {},
     getProps: () => ({}),
     // Headers only
+    header: undefined,
     headerClassName: '',
     headerStyle: {},
     getHeaderProps: () => ({})
-    // Footers only
-    footerClassName: '',
-    footerStyle: {},
-    getFooterProps: () => ({}),
-    filterMethod: undefined,
-    sortMethod: 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',
@@ -335,160 +238,64 @@ 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 (see "Accessors" section for more details)
+  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: boolean, // Overrides the table option
-  resizable: boolean, // Overrides the table option
-  filterable: boolean, // Overrides the table option
+  sortable: true,
+  sort: 'asc' or 'desc', // used to determine the column sorting on init
   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
-  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
+  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. (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, 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 == the row of data supplied to the table
-    // column == the column that the filter is on
 }]
 ```
 
-## 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 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):
+## 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
-- `row` - The post-accessed values from the original row
+- `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)
@@ -500,9 +307,9 @@ You can use any react component or JSX to display content in column headers, cel
 // 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',
-  Cell: row => (
+  render: row => (
     <div
       style={{
         width: '100%',
@@ -528,19 +335,17 @@ const columns = [{
 ```
 
 ## Styles
-- 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.
+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`.
 
-#### Classes
+#### 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
+#### 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 supports `classname` and `style` props.
+Every single react-table element and `get[ComponentName]Props` callback support classes (powered by `classname` and js styles.
 
 ## Custom Props
 
@@ -563,16 +368,14 @@ 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 four parameters:
- 1. Table State
- 2. RowInfo (undefined if not applicable)
- 3. Column (undefined if not applicable)
- 4. React Table Instance
+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
@@ -599,7 +402,7 @@ You can use these callbacks for dynamic styling as well!
   getTrProps={(state, rowInfo, column) => {
     return {
       style: {
-        background: rowInfo.row.age > 20 ? 'green' : 'red'
+        background: rowInfo.age > 20 ? 'green' : 'red'
       }
     }
   }}
@@ -624,14 +427,14 @@ const columns = [{
   getProps: (state, rowInfo, column) => {
     return {
       style: {
-        background: rowInfo.row.name === 'Santa Clause' ? 'red' : null
+        background: rowInfo.name === 'Santa Clause' ? 'red' : null
       }
     }
   }
 }]
 ```
 
-## Pivoting and Aggregation
+## 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.
 ```javascript
@@ -645,23 +448,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)),
-  Aggregated: row => {
+  render: row => {
     // You can even render the cell differently if it's an aggregated cell
-    return <span>row.value (avg)</span>
+    return <span>{row.aggregated ? `${row.value} (avg)` : row.value}</span>
   }
 }, {
-  Header: 'Visits',
+  header: 'Visits',
   accessor: 'visits',
   aggregate: (values, rows) => _.sum(values)
 }]
 ```
 
-Pivoted columns can be sorted just like regular columns including holding down the `<shift>` button to multi-sort.
+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.
 
-## Sub Tables and Sub Components
+## Sub Tables & Sub Components
 By adding a `SubComponent` props, you can easily add an expansion level to all root-level rows:
 ```javascript
 <ReactTable
@@ -680,12 +483,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, sorting, and filtering on the server, `react-table` makes it easy on you.
+If you want to handle pagination, and sorting 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 `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. 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. Update your data with the rows to be displayed
 1. Optionally set how many pages there are total
 
@@ -696,15 +499,14 @@ If you want to handle pagination, sorting, and filtering on the server, `react-t
   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
-  onFetchData={(state, instance) => {
+  onChange={(state, instance) => {
     // show the loading overlay
     this.setState({loading: true})
     // fetch your data
     Axios.post('mysite.com/data', {
       page: state.page,
       pageSize: state.pageSize,
-      sorted: state.sorted,
-      filtered: state.filtered
+      sorting: state.sorting
     })
       .then((res) => {
         // Update react-table
@@ -729,150 +531,97 @@ 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={[{ // the sorting model for the table
+  sorting={[{
       id: 'lastName',
-      desc: true
+      asc: true
     }, {
       id: 'firstName',
-      desc: true
-  }]}
-  expandedRows={{ // The nested row indexes on the current page that should appear expanded
+      asc: true
+  }]} // the sorting model for the table
+  expandedRows={{
     1: true,
     4: true,
     5: {
       2: true,
       3: true
     }
-  }}
-  filters={[{ // the current filters model
-    id: 'lastName',
-    value: 'linsley'
-  }]}
-  resizing={[{ // the current resized column model
-    "id": "lastName",
-    "value": 446.25
-  }]}
+  }} // The nested row indexes on the current page that should appear expanded
 
   // 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
-  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 `expandedRows`
-  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 filterRender option.
-  onResizedChange={(newResized, event) => {...}} // Called when a user clicks on a resizing component (the right edge of a column header)
+  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`
 />
 ```
 
 ## Functional Rendering
-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 />`.
+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
-- A function that returns the standard table component
+- 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 without a `ref`
-- Decorating the table or extending it with your own UI
-- Building your own custom display logic
+- 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 internal state and wrapping with more UI:
+Example:
 ```javascript
 <ReactTable
-  data={data}
   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 style={{
-        background: '#ffcf00',
-        borderRadius: '5px',
-        overflow: 'hidden',
-        padding: '5px'
-      }}>
-        <pre><code>state.allVisibleColumns === {JSON.stringify(state.allVisibleColumns, null, 4)}</code></pre>
+      <div>
+        <customPivotBySelect />
+        <customColumnHideShow />
+        <customAnything />
         {makeTable()}
       </div>
     )
+
+    // The possibilities are endless!!!
+
   }}
 </ReactTable>
 ```
 
-The possibilities are endless!
-
-## Sorting
-Sorting comes built in with React-Table. Click column header to sort by its column. Click it again to reverse the sort. 
-
 ## 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 = 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 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.
-
-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/?selectedKind=2.%20Demos&selectedStory=Custom%20Filtering&full=0&down=1&left=1&panelRight=0&downPanel=kadirahq%2Fstorybook-addon-actions%2Factions-panel" 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,
-  TfootComponent: component,
-  ExpanderComponent: component,
-  AggregatedComponent: component,
-  PivotValueComponent: component,
-  PivotComponent: component,
-  FilterComponent: component,
-  PaginationComponent: component,
-  PreviousComponent: undefined,
-  NextComponent: undefined,
-  LoadingComponent: component,
-  NoDataComponent: component,
-  ResizerComponent: component
+  TableComponent: Component,
+  TheadComponent: Component,
+  TbodyComponent: Component,
+  TrGroupComponent: Component,
+  TrComponent: Component,
+  ThComponent: Component,
+  TdComponent: Component,
+  PaginationComponent: Component,
+  PreviousComponent: Component,
+  NextComponent: Component,
+  LoadingComponent: Component,
+  ExpanderComponent: Component
 })
 
 // Or change per instance

docs/iframe.html

@@ -16,7 +16,7 @@
       <body>
         <div id="root"></div>
         <div id="error-display"></div>
-        <script src="static/preview.b8deff9f16f0debf5b04.bundle.js"></script>
+        <script src="static/preview.ee446fa2bd3fbfe7e38a.bundle.js"></script>
       </body>
     </html>
   

docs/index.html

@@ -38,7 +38,7 @@
       </head>
       <body style="margin: 0;">
         <div id="root"></div>
-        <script src="static/manager.4dc6928017acc8856e42.bundle.js"></script>
+        <script src="static/manager.f127c5ae855df8d8558a.bundle.js"></script>
       </body>
     </html>
   

docs/static/manager.4dc6928017acc8856e42.bundle.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"static/manager.4dc6928017acc8856e42.bundle.js","sources":["webpack:///static/manager.4dc6928017acc8856e42.bundle.js"],"mappings":"AAAA;AAmuDA;AA64DA;AA28DA;AA00DA;AAsvEA;AAuhDA;AAsrDA;AAsiDA;AAg6DA;AA2nDA;AA++CA;AAkvDA;AAsnEA;AA2oDA;AAivCA;AA+nDA;AAkpDA;AA6lEA;AAs4DA;AAquDA;AA+pDA;AAoxDA;AAsrDA;AAkzDA;AA88GA;AAj6CA;AAopGA;AAsuFA;AA+zEA;AAtMA;AAo0EA","sourceRoot":""}

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.b8deff9f16f0debf5b04.bundle.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"static/preview.b8deff9f16f0debf5b04.bundle.js","sources":["webpack:///static/preview.b8deff9f16f0debf5b04.bundle.js"],"mappings":"AAAA;AAsnDA;AAg2EA;AA48EA;AA2lFA;AAmhQA;AA2/DA;AAguDA;AA8kEA;AA4xDA;AAo2DA;AAkwDA;AAunDA;AAsiDA;AA84DA;AA+nDA;AA69CA;AAunDA;AAqlEA;AA48DA;AAqgCA;AA+uDA;AAwmDA;AAiqEA;AA80DA;AAg2DA;AAwxCA;AAwqFA;AAmjGA;AA+mDA;AAk9CA;AA0xCA;AA60CA;AA8tCA;AAmmDA;AAiiBA;AAWA;AAmsEA;AAwEA;AAq9BA","sourceRoot":""}

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

@@ -0,0 +1 @@
+{"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,6 +1,6 @@
 {
   "name": "react-table",
-  "version": "6.0.1",
+  "version": "5.0.3",
   "description": "A fast, lightweight, opinionated table and datagrid built on React",
   "license": "MIT",
   "homepage": "https://github.com/tannerlinsley/react-table#readme",
@@ -24,22 +24,19 @@
   ],
   "scripts": {
     "build:node": "babel src --out-dir lib --source-maps inline",
-    "build:css": "rimraf react-table.css && stylus src/index.styl --compress -o react-table.css && yarn run css:autoprefix",
+    "build:css": "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",
     "test": "standard",
-    "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",
+    "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"
   },
   "dependencies": {
-    "classnames": "^2.2.5",
-    "raw-loader": "^0.5.1"
+    "classnames": "^2.2.5"
   },
   "peerDependencies": {
     "react": "^15.x.x"
@@ -52,6 +49,8 @@
     "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",
@@ -62,11 +61,12 @@
     "react": "^15.4.2",
     "react-dom": "^15.4.2",
     "react-json-tree": "^0.10.1",
-    "rimraf": "^2.6.1",
     "standard": "^8.0.0",
-    "storybook": "^0.0.0",
     "stylus": "^0.54.5",
-    "webpack": "^2.4.1"
+    "uglifyify": "3.0.3"
+  },
+  "browserify-shim": {
+    "react": "global:React"
   },
   "standard": {
     "parser": "babel-eslint",

src/componentMethods.js

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

@@ -1,235 +0,0 @@
-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,
-  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,
-  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,
-    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'),
-  TheadComponent: _.makeTemplateComponent('rt-thead'),
-  TbodyComponent: _.makeTemplateComponent('rt-tbody'),
-  TrGroupComponent: _.makeTemplateComponent('rt-tr-group'),
-  TrComponent: _.makeTemplateComponent('rt-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'),
-  TfootComponent: _.makeTemplateComponent('rt-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'),
-  ResizerComponent: _.makeTemplateComponent('rt-resizer')
-}

src/index.styl

@@ -18,21 +18,10 @@ $expandSize = 7px
   .rt-thead
     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)
 
@@ -41,9 +30,7 @@ $expandSize = 7px
 
     .rt-th
     .rt-td
-      padding: 5px 5px
-      line-height: normal
-      position: relative
+      color: black
       border-right: 1px solid alpha(black, .05)
       transition box-shadow .3s $easeOutBack
       box-shadow:inset 0 0 0 0 transparent
@@ -55,41 +42,6 @@ $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
     display: flex
     flex-direction: column
@@ -102,7 +54,7 @@ $expandSize = 7px
       border-right:1px solid alpha(black, .02)
       &:last-child
         border-right:0
-    .rt-expandable
+    .rt-pivot
       cursor: pointer
   .rt-tr-group
     display: flex
@@ -149,26 +101,6 @@ $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
-    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)
@@ -185,7 +117,6 @@ $expandSize = 7px
     flex-wrap: wrap
     padding: 3px
     box-shadow: 0 0px 15px 0px alpha(black, .1)
-    border-top: 2px solid alpha(black, .1)
 
     .-btn
       appearance:none
@@ -239,18 +170,6 @@ $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
@@ -285,6 +204,7 @@ $expandSize = 7px
 
   input
   select
+    appearance: none
     border: 1px solid rgba(0,0,0,0.1)
     background: white
     padding: 5px 7px
@@ -293,10 +213,6 @@ $expandSize = 7px
     font-weight: normal
     outline:none
 
-  input:not([type="checkbox"]):not([type="radio"])
-  select
-    appearance: none
-
   .select-wrap
     position:relative
     display:inline-block
@@ -312,10 +228,3 @@ $expandSize = 7px
       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

@@ -1,101 +0,0 @@
-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) ||
-        (!newResolvedState.frozen && oldState.resolvedData !== newResolvedState.resolvedData && this.props.collapseOnDataChange)
-      ) {
-        newResolvedState.expanded = {}
-      }
-
-      Object.assign(newResolvedState, this.getSortedData(newResolvedState))
-    }
-
-    // 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)
-  }
-}

src/methods.js

@@ -1,666 +0,0 @@
-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) => {
-      let dcol
-      if (column.expander) {
-        dcol = {
-          ...this.props.column,
-          ...this.props.expanderDefaults,
-          ...column
-        }
-      } else {
-        dcol = {
-          ...this.props.column,
-          ...column
-        }
-      }
-
-      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)
-    })
-
-    // 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 pivotColumnGroup = {
-        header: () => <strong>Group</strong>,
-        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) => {
-          return filteredSoFar.filter(
-            (row) => {
-              let column
-
-              column = allVisibleColumns.find(x => x.id === nextFilter.id || (x.pivotColumns && x.pivotColumns.some(y => y.id === nextFilter.id)))
-
-              // Could possibly be in pivotColumns
-              if (column.id !== nextFilter.id && column.pivotColumns) {
-                column = column.pivotColumns.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 true
-              }
-
-              const filterMethod = column.filterMethod || defaultFilterMethod
-
-              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
-    onPageChange && onPageChange(page)
-    // If controlled, do not keep track of state
-    if (typeof this.props.page !== 'undefined') {
-      this.fireFetchData()
-      return
-    }
-    const newState = {page}
-    if (collapseOnPageChange) {
-      newState.expanded = {}
-    }
-    this.setStateWithData(newState, () => {
-      this.fireFetchData()
-    })
-  }
-
-  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)
-
-    onPageSizeChange && onPageSizeChange(newPageSize, newPage)
-    if (typeof this.props.page !== 'undefined') {
-      this.fireFetchData()
-      return
-    }
-
-    this.setStateWithData({
-      pageSize: newPageSize,
-      page: newPage
-    }, () => {
-      this.fireFetchData()
-    })
-  }
-
-  sortColumn (column, additive) {
-    const {sorted, skipNextSort} = this.getResolvedState()
-
-    // 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) {
-          if (additive) {
-            newSorted.splice(existingIndex, 1)
-          } else {
-            existing.desc = false
-            newSorted = [existing]
-          }
-        } else {
-          existing.desc = true
-          if (!additive) {
-            newSorted = [existing]
-          }
-        }
-      } else {
-        if (additive) {
-          newSorted.push({
-            id: column.id,
-            desc: false
-          })
-        } else {
-          newSorted = [{
-            id: column.id,
-            desc: false
-          }]
-        }
-      }
-    } 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) {
-          if (additive) {
-            newSorted.splice(existingIndex, column.length)
-          } else {
-            column.forEach((d, i) => {
-              newSorted[existingIndex + i].desc = false
-            })
-          }
-        } else {
-          column.forEach((d, i) => {
-            newSorted[existingIndex + i].desc = true
-          })
-        }
-        if (!additive) {
-          newSorted = newSorted.slice(existingIndex, column.length)
-        }
-      } else {
-        // New Sort Column
-        if (additive) {
-          newSorted = newSorted.concat(column.map(d => ({
-            id: d.id,
-            desc: false
-          })))
-        } else {
-          newSorted = column.map(d => ({
-            id: d.id,
-            desc: false
-          }))
-        }
-      }
-    }
-    // If controlled, do not keep track of state
-    onSortedChange && onSortedChange(newSorted, column, additive)
-    if (typeof this.props.sorted !== 'undefined') {
-      this.fireFetchData()
-      return
-    }
-    this.setStateWithData({
-      page: ((!sorted.length && newSorted.length) || !additive) ? 0 : this.state.page,
-      sorted: newSorted
-    }, () => {
-      this.fireFetchData()
-    })
-  }
-
-  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
-      })
-    }
-
-    onFilteredChange && onFilteredChange(newFiltering, column, value)
-
-    // If filters is being controlled, do not manage state internally
-    if (this.props.filtered) {
-      this.fireFetchData()
-      return
-    }
-
-    this.setStateWithData({
-      filtered: newFiltering
-    }, () => {
-      this.fireFetchData()
-    })
-  }
-
-  resizeColumnStart (column, event, isTouch) {
-    const parentWidth = event.target.parentElement.getBoundingClientRect().width
-
-    let pageX
-    if (isTouch) {
-      pageX = event.changedTouches[0].pageX
-    } else {
-      pageX = event.pageX
-    }
-
-    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)
-      }
-    })
-  }
-
-  resizeColumnEnd (event) {
-    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
-      })
-    }
-  }
-
-  resizeColumnMoving (event) {
-    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
-    })
-
-    onResizedChange && onResizedChange(newResized, event)
-
-    if (this.props.resized) {
-      return
-    }
-
-    this.setStateWithData({
-      resized: newResized
-    })
-  }
-}

src/pagination.js

@@ -1,50 +1,34 @@
-import React, { Component } from 'react'
+import React from 'react'
 import classnames from 'classnames'
 //
 // import _ from './utils'
 
 const defaultButton = (props) => (
-  <button type='button' {...props} className='-btn'>{props.children}</button>
+  <button {...props} className='-btn'>{props.children}</button>
 )
 
-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
+export default React.createClass({
+  getInitialState () {
+    return {
+      page: this.props.page
     }
-  }
-
+  },
   componentWillReceiveProps (nextProps) {
     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})
-    if (this.props.page !== page) {
-      this.props.onPageChange(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
@@ -82,7 +66,9 @@ export default class ReactTablePagination extends Component {
         <div className='-center'>
           <span className='-pageInfo'>
             {this.props.pageText} {showPageJump ? (
-              <div className='-pageJump'>
+              <form className='-pageJump'
+                onSubmit={this.applyPage}
+              >
                 <input
                   type={this.state.page === '' ? 'text' : 'number'}
                   onChange={e => {
@@ -95,16 +81,11 @@ export default class ReactTablePagination extends Component {
                   }}
                   value={this.state.page === '' ? '' : this.state.page + 1}
                   onBlur={this.applyPage}
-                  onKeyPress={e => {
-                    if (e.which === 13 || e.keyCode === 13) {
-                      this.applyPage()
-                    }
-                  }}
                 />
-              </div>
+              </form>
             ) : (
               <span className='-currentPage'>{page + 1}</span>
-            )} {this.props.ofText} <span className='-totalPages'>{pages || 1}</span>
+            )} {this.props.ofText} <span className='-totalPages'>{pages}</span>
           </span>
           {showPageSizeOptions && (
             <span className='select-wrap -pageSizeOptions'>
@@ -139,4 +120,4 @@ export default class ReactTablePagination extends Component {
       </div>
     )
   }
-}
+})

src/utils.js

@@ -15,10 +15,7 @@ export default {
   makeTemplateComponent,
   groupBy,
   isArray,
-  splitProps,
-  compactObject,
-  isSortingDesc,
-  normalizeComponent
+  splitProps
 }
 
 function get (obj, path, def) {
@@ -64,20 +61,23 @@ function range (n) {
   return arr
 }
 
-function orderBy (arr, funcs, dirs, indexKey) {
-  return arr.sort((rowA, rowB) => {
+function orderBy (arr, funcs, dirs) {
+  return arr.sort((a, b) => {
     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'
-      const sortInt = comp(rowA, rowB)
-      if (sortInt) {
-        return desc ? -sortInt : sortInt
+      if (ca > cb) {
+        return desc ? -1 : 1
+      }
+      if (ca < cb) {
+        return desc ? 1 : -1
       }
     }
-    // Use the row index for tie breakers
     return dirs[0]
-      ? rowA[indexKey] - rowB[indexKey]
-      : rowB[indexKey] - rowA[indexKey]
+      ? a.__index - b.__index
+      : b.__index - b.__index
   })
 }
 
@@ -173,27 +173,3 @@ function splitProps ({className, style, ...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

@@ -2,107 +2,169 @@ import React from 'react'
 import _ from 'lodash'
 import namor from 'namor'
 
+import CodeHighlight from './components/codeHighlight'
 import ReactTable from '../src/index'
 
-class Story extends React.Component {
-  render () {
-    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'
-      }
-    })
+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
-      }]
+  const columns = [{
+    header: 'Name',
+    columns: [{
+      header: 'First Name',
+      accessor: 'firstName'
     }, {
-      Header: 'Info',
-      columns: [{
-        Header: 'Profile Progress',
-        accessor: 'progress',
-        Cell: row => (
+      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: '100%',
+              width: `${row.value}%`,
               height: '100%',
-              backgroundColor: '#dadada',
-              borderRadius: '2px'
+              backgroundColor: row.value > 66 ? '#85cc00'
+                : row.value > 33 ? '#ffbf00'
+                : '#ff2e00',
+              borderRadius: '2px',
+              transition: 'all .2s ease-out'
             }}
-          >
-            <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',
-        Cell: 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>
+      )
+    }, {
+      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>
+  )
 }
 
-// Source Code
-const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./CellRenderers')
+function getCode () {
+  return `
+import ReactTable from 'react-table'
 
-export default () => (
-  <div>
-    <Story />
-    <CodeHighlight>{() => source}</CodeHighlight>
-  </div>
+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/ControlledTable.js

@@ -1,88 +0,0 @@
-import React from 'react'
-import _ from 'lodash'
-import namor from 'namor'
-
-import ReactTable from '../src/index'
-
-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'
-  }]
-}]
-
-class Story extends React.Component {
-  constructor () {
-    super()
-    this.state = {
-      sorted: [],
-      page: 0,
-      pageSize: 10,
-      expanded: {},
-      resized: [],
-      filtered: []
-    }
-  }
-  render () {
-    return (
-      <div>
-        <div className='table-wrap'>
-          <ReactTable
-            className='-striped -highlight'
-            data={data}
-            columns={columns}
-            pivotBy={['lastName']}
-            filterable
-            // Controlled Props
-            sorted={this.state.sorted}
-            page={this.state.page}
-            pageSize={this.state.pageSize}
-            expanded={this.state.expanded}
-            resized={this.state.resized}
-            filtered={this.state.filtered}
-            // Callbacks
-            onSortedChange={sorted => this.setState({sorted})}
-            onPageChange={page => this.setState({page})}
-            onPageSizeChange={(pageSize, page) => this.setState({page, pageSize})}
-            onExpandedChange={expanded => this.setState({expanded})}
-            onResizedChange={resized => this.setState({resized})}
-            onFilteredChange={filtered => this.setState({filtered})}
-          />
-        </div>
-        <br />
-        <pre><code><strong>this.state ===</strong> {JSON.stringify(this.state, null, 2)}</code></pre>
-        <br />
-      </div>
-    )
-  }
-}
-
-// Source Code
-const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./ControlledTable')
-
-export default () => (
-  <div>
-    <Story />
-    <CodeHighlight>{() => source}</CodeHighlight>
-  </div>
-)

stories/CustomComponentProps.js

@@ -2,74 +2,85 @@ import React from 'react'
 import _ from 'lodash'
 import namor from 'namor'
 
+import CodeHighlight from './components/codeHighlight'
 import ReactTable from '../src/index'
 
-class Story extends React.Component {
-  render () {
-    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)
-      }
-    })
+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
-      }]
+  const columns = [{
+    header: 'Name',
+    columns: [{
+      header: 'First Name',
+      accessor: 'firstName'
     }, {
-      Header: 'Info',
-      columns: [{
-        Header: 'Age',
-        accessor: 'age'
-      }]
+      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>
+  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>
+  )
 }
 
-// Source Code
-const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./CustomComponentProps')
+function getCode () {
+  return `
+import ReactTable from 'react-table'
 
-export default () => (
-  <div>
-    <Story />
-    <CodeHighlight>{() => source}</CodeHighlight>
-  </div>
+// 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

@@ -2,79 +2,106 @@ import React from 'react'
 import _ from 'lodash'
 import namor from 'namor'
 
+import CodeHighlight from './components/codeHighlight'
 import ReactTable from '../src/index'
 
-class Story extends React.Component {
-  render () {
-    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)
+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>
       }
-    })
-
-    const columns = [{
-      Header: 'Name',
-      columns: [{
-        Header: 'First Name',
-        accessor: 'firstName',
-        Footer: () => <div style={{textAlign: 'center'}}>First Name</div>
-      }, {
-        Header: 'Last Name',
-        accessor: 'lastName',
-        Footer: () => <div style={{textAlign: 'center'}}>Last Name</div>
-      }]
     }, {
-      Header: 'Info',
-      columns: [{
-        Header: 'Age',
-        accessor: 'age',
-        Footer: () => <div style={{textAlign: 'center'}}>Age</div>
-      }]
-    }, {
-      Header: 'Expand',
-      columns: [{
-        expander: true,
-        Header: () => (<strong>More</strong>),
-        width: 65,
-        Expander: ({isExpanded, ...rest}) => (
-          <div>
-            {isExpanded ? <span>&#x2299;</span> : <span>&#x2295;</span>}
-          </div>
-        ),
-        style: {cursor: 'pointer', fontSize: 25, padding: '0', textAlign: 'center', userSelect: 'none'},
-        Footer: () => <span>&hearts;</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>
+  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>
+  )
 }
 
-// Source Code
-const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./CustomExpanderPosition')
+function getCode () {
+  return `
+import ReactTable from 'react-table'
 
-export default () => (
-  <div>
-    <Story />
-    <CodeHighlight>{() => source}</CodeHighlight>
-  </div>
+// 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/CustomSorting.js

@@ -1,77 +0,0 @@
-import React from 'react'
-import _ from 'lodash'
-import namor from 'namor'
-
-import ReactTable from '../src/index'
-
-class Story extends React.Component {
-  render () {
-    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 (Sorted by Length, A-Z)',
-        accessor: 'firstName',
-        sortMethod: (a, b) => {
-          if (a.length === b.length) {
-            return a > b ? 1 : -1
-          }
-          return a.length > b.length ? 1 : -1
-        }
-      }, {
-        Header: 'Last Name (Sorted in reverse, A-Z)',
-        id: 'lastName',
-        accessor: d => d.lastName,
-        sortMethod: (a, b) => {
-          if (a === b) {
-            return 0
-          }
-          const aReverse = a.split('').reverse().join('')
-          const bReverse = b.split('').reverse().join('')
-          return aReverse > bReverse ? 1 : -1
-        }
-      }]
-    }, {
-      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>
-      </div>
-    )
-  }
-}
-
-// Source Code
-const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./CustomSorting')
-
-export default () => (
-  <div>
-    <Story />
-    <CodeHighlight>{() => source}</CodeHighlight>
-  </div>
-)

stories/CustomWidths.js

@@ -2,65 +2,90 @@ import React from 'react'
 import _ from 'lodash'
 import namor from 'namor'
 
+import CodeHighlight from './components/codeHighlight'
 import ReactTable from '../src/index'
 
-class Story extends React.Component {
-  render () {
-    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)
-      }
-    })
+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
-      }]
+  const columns = [{
+    header: 'Name',
+    columns: [{
+      header: 'First Name',
+      accessor: 'firstName',
+      maxWidth: 200
     }, {
-      Header: 'Info',
-      columns: [{
-        Header: 'Age',
-        accessor: 'age',
-        minWidth: 400
-      }]
+      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>
+  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>
+  )
 }
 
-// Source Code
-const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./CustomWidths')
+function getCode () {
+  return `
+import ReactTable from 'react-table'
 
-export default () => (
-  <div>
-    <Story />
-    <CodeHighlight>{() => source}</CodeHighlight>
-  </div>
+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

@@ -2,66 +2,86 @@ import React from 'react'
 import _ from 'lodash'
 import namor from 'namor'
 
+import CodeHighlight from './components/codeHighlight'
 import ReactTable from '../src/index'
 
-class Story extends React.Component {
-  render () {
-    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)
-      }
-    })
+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
-      }]
+  const columns = [{
+    header: 'Name',
+    columns: [{
+      header: 'First Name',
+      accessor: 'firstName'
     }, {
-      Header: 'Info',
-      columns: [{
-        Header: 'Age',
-        accessor: 'age'
-      }]
+      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}
-            defaultSorted={[{
-              id: 'age',
-              desc: true
-            }]}
-          />
-        </div>
-        <div style={{textAlign: 'center'}}>
-          <br />
-          <em>Tip: Hold shift when sorting to multi-sort!</em>
-        </div>
+  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>
+  )
 }
 
-// Source Code
-const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./DefaultSorting')
+function getCode () {
+  return `
+import ReactTable from 'react-table'
 
-export default () => (
-  <div>
-    <Story />
-    <CodeHighlight>{() => source}</CodeHighlight>
-  </div>
+// 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/EditableTable.js

@@ -1,69 +0,0 @@
-import React from 'react'
-
-import ReactTable from '../src/index'
-
-class Story extends React.Component {
-  constructor (props, context) {
-    super(props, context)
-    this.renderEditable = this.renderEditable.bind(this)
-
-    this.state = {
-      data: [
-        { firstName: 'Lucy', lastName: 'Marks' },
-        { firstName: 'Bejamin', lastName: 'Pike' }
-      ]
-    }
-
-    this.columns = [
-      {
-        Header: 'First Name',
-        accessor: 'firstName',
-        Cell: this.renderEditable
-      },
-      {
-        Header: 'Last Name',
-        accessor: 'lastName',
-        Cell: this.renderEditable
-      },
-      {
-        Header: 'Full Name',
-        id: 'full',
-        accessor: d => d.firstName + ' ' + d.lastName
-      }
-    ]
-  }
-
-  renderEditable (cellInfo) {
-    return (<div style={{ backgroundColor: '#fafafa' }} contentEditable suppressContentEditableWarning onBlur={(e) => {
-      const data = [...this.state.data]
-      data[cellInfo.index][cellInfo.column.id] = e.target.textContent
-      this.setState({data: data})
-    }}>{this.state.data[cellInfo.index][cellInfo.column.id]}</div>)
-  }
-
-  render () {
-    return (
-      <div className='table-wrap' style={{marginBottom: '20px'}}>
-        <p>First two columns are editable just by clicking into them using the <code>contentEditable</code> attribute. Last column (Full Name) is computed from the first two.</p>
-        <ReactTable
-          data={this.state.data}
-          columns={this.columns}
-          defaultPageSize={2}
-          showPageSizeOptions={false}
-          showPagination={false}
-        />
-      </div>
-    )
-  }
-}
-
-// Source Code
-const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./EditableTable')
-
-export default () => (
-  <div>
-    <Story />
-    <CodeHighlight>{() => source}</CodeHighlight>
-  </div>
-)

stories/Filtering.js

@@ -1,193 +0,0 @@
-import React from 'react'
-import _ from 'lodash'
-import namor from 'namor'
-
-import CodeHighlight from './components/codeHighlight'
-
-import ReactTable from '../src/index'
-
-class Story extends React.Component {
-  constructor (props) {
-    super(props)
-
-    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)
-      }
-    })
-
-    this.state = {
-      tableOptions: {
-        loading: false,
-        showPagination: true,
-        showPageSizeOptions: true,
-        showPageJump: true,
-        collapseOnSortingChange: true,
-        collapseOnPageChange: true,
-        collapseOnDataChange: true,
-        freezeWhenExpanded: false,
-        filterable: true,
-        sortable: true,
-        resizable: true
-      },
-      data: data
-    }
-
-    this.setTableOption = this.setTableOption.bind(this)
-  }
-
-  render () {
-    const columns = [{
-      Header: 'Name',
-      columns: [{
-        Header: 'First Name',
-        accessor: 'firstName',
-        filterMethod: (filter, row) => (row[filter.id].startsWith(filter.value) && row[filter.id].endsWith(filter.value))
-      }, {
-        Header: 'Last Name',
-        id: 'lastName',
-        accessor: d => d.lastName,
-        filterMethod: (filter, row) => (row[filter.id].includes(filter.value))
-      }]
-    }, {
-      Header: 'Info',
-      columns: [{
-        Header: 'Age',
-        accessor: 'age'
-      }, {
-        Header: 'Over 21',
-        accessor: 'age',
-        id: 'over',
-        Cell: ({value}) => (value >= 21 ? 'Yes' : 'No'),
-        filterMethod: (filter, row) => {
-          if (filter.value === 'all') {
-            return true
-          }
-          if (filter.value === 'true') {
-            return row[filter.id] >= 21
-          }
-          return row[filter.id] < 21
-        },
-        Filter: ({filter, onChange}) => (
-          <select
-            onChange={event => onChange(event.target.value)}
-            style={{width: '100%'}}
-            value={filter ? filter.value : 'all'}
-          >
-            <option value='all' />
-            <option value='true'>Can Drink</option>
-            <option value='false'>Can't Drink</option>
-          </select>
-        )
-      }
-      ]
-    }]
-
-    return (
-      <div>
-        <div style={{float: 'left'}}>
-          <h1>Table Options</h1>
-          <table>
-            <tbody>
-              {
-                Object.keys(this.state.tableOptions).map(optionKey => {
-                  const optionValue = this.state.tableOptions[optionKey]
-                  return (
-                    <tr key={optionKey}>
-                      <td>{optionKey}</td>
-                      <td style={{paddingLeft: 10, paddingTop: 5}}>
-                        <input type='checkbox'
-                          name={optionKey}
-                          checked={optionValue}
-                          onChange={this.setTableOption}
-                        />
-                      </td>
-                    </tr>
-                  )
-                })
-              }
-            </tbody>
-          </table>
-        </div>
-        <div className='table-wrap' style={{paddingLeft: 240}}>
-          <ReactTable
-            className='-striped -highlight'
-            data={this.state.data}
-            columns={columns}
-            defaultPageSize={10}
-            defaultFilterMethod={(filter, row) => (String(row[filter.id]) === filter.value)}
-            {...this.state.tableOptions}
-            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={this.state.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>
-        <div>
-          <h1>Custom Filters In This Example</h1>
-          <p>The default filter for all columns of a table if it is not specified in the configuration is set to match
-          on values that start with the filter text. Example: age.startsWith("2").</p>
-          <p>This example overrides the default filter behavior by setting
-            the <strong>defaultFilterMethod</strong> table option to match on values that are exactly equal to the
-          filter text. Example: age == "23")</p>
-          <p>Each column can also be customized with the column <strong>filterMethod</strong> option:</p>
-          <p>In this example the firstName column filters on the value starting with and ending with the filter
-          value.</p>
-          <p>In this example the lastName column filters on the value including the filter value anywhere in its
-          text.</p>
-          <p>To completely override the filter that is shown, you can set the <strong>Filter</strong> column
-            option. Using this option you can specify the JSX that is shown. The option is passed
-            an <strong>onChange</strong> method that must be called with the value that you wan't to
-            pass to the <strong>filterMethod</strong> option whenever the filter has changed.</p>
-        </div>
-      </div>
-    )
-  }
-
-  setTableOption (event) {
-    const target = event.target
-    const value = target.type === 'checkbox' ? target.checked : target.value
-    const name = target.name
-    this.setState({
-      tableOptions: {
-        ...this.state.tableOptions,
-        [name]: value
-      }
-    })
-  }
-}
-
-// Source Code
-const source = require('!raw-loader!./Filtering')
-
-export default () => (
-  <div>
-    <Story />
-    <CodeHighlight>{() => source}</CodeHighlight>
-  </div>
-)

stories/Footers.js

@@ -1,91 +0,0 @@
-import React from 'react'
-import _ from 'lodash'
-import namor from 'namor'
-
-import ReactTable from '../src/index'
-
-class Story extends React.Component {
-  render () {
-    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',
-        Footer: (
-          <span><strong>Popular:</strong> {
-            _.first(
-              _.reduce(
-                _.map(
-                  _.groupBy(
-                    data, d => d.firstName
-                  )
-                ),
-                (a, b) => a.length > b.length ? a : b
-              )
-            ).firstName}
-          </span>
-        )
-      }, {
-        Header: 'Last Name',
-        id: 'lastName',
-        accessor: d => d.lastName,
-        Footer: (
-          <span><strong>Longest:</strong> {
-            _.reduce(
-              _.map(
-                _.groupBy(
-                  data, d => d.lastName
-                ),
-                (d, key) => key
-              ),
-              (a, b) => a.length > b.length ? a : b
-            )}
-          </span>
-        )
-      }]
-    }, {
-      Header: 'Info',
-      columns: [{
-        Header: 'Age',
-        accessor: 'age',
-        Footer: <span><strong>Average:</strong> {_.round(_.mean(_.map(data, d => d.age)))}</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>
-      </div>
-    )
-  }
-}
-
-// Source Code
-const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./Footers')
-
-export default () => (
-  <div>
-    <Story />
-    <CodeHighlight>{() => source}</CodeHighlight>
-  </div>
-)

stories/FunctionalRendering.js

@@ -3,6 +3,7 @@ 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 = {
@@ -26,111 +27,114 @@ const JSONtheme = {
   base0F: '#cc6633'
 }
 
-class Story extends React.Component {
-  render () {
-    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)
-      }
-    })
+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',
-        Footer: 'Footer'
-      }, {
-        Header: 'Last Name',
-        id: 'lastName',
-        accessor: d => d.lastName,
-        Footer: 'Footer'
-      }]
+  const columns = [{
+    header: 'Name',
+    columns: [{
+      header: 'First Name',
+      accessor: 'firstName'
     }, {
-      Header: 'Info',
-      columns: [{
-        Header: 'Age',
-        accessor: 'age',
-        Footer: 'Footer'
-      }]
+      header: 'Last Name',
+      id: 'lastName',
+      accessor: d => d.lastName
     }]
+  }, {
+    header: 'Info',
+    columns: [{
+      header: 'Age',
+      accessor: 'age'
+    }]
+  }]
 
-    return (
-      <div>
-        <strong>Functional rendering</strong> simply means that you have all of the building blocks to render your own React Table however you'd like.
-
-        <br />
-        <br />
-        <br />
-        <br />
-
-        <strong>Decorating the standard table output</strong>
-        <br />
-        <br />
-
-        <div className='table-wrap'>
-          <ReactTable
-            data={data}
-            columns={columns}
-          >
-            {(state, makeTable, instance) => {
-              return (
-                <div style={{
-                  background: '#ffcf00',
-                  borderRadius: '5px',
-                  overflow: 'hidden',
-                  padding: '5px'
-                }}>
-                  <pre><code>state.allVisibleColumns === {JSON.stringify(state.allVisibleColumns, null, 4)}</code></pre>
-                  {makeTable()}
-                </div>
-              )
-            }}
-          </ReactTable>
-        </div>
-
-        <br />
-        <br />
-
-        <strong>Need more control? This is the entire table state and component instance at your disposal!</strong>
-        <br />
-        <br />
-
-        <div className='table-wrap'>
-          <ReactTable
-            className='-striped -highlight'
-            data={data}
-            columns={columns}
-            defaultPageSize={10}
-          >
-            {(state, StandardTable, instance) => {
-              return (
-                <div>
-                  <JSONTree
-                    data={Object.assign({}, state, {children: 'function () {...}'})}
-                    theme={JSONtheme}
-                    invertTheme
-                  />
-                </div>
-              )
-            }}
-          </ReactTable>
-        </div>
-        <br />
+  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>
+  )
 }
 
-// Source Code
-const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./FunctionalRendering')
+function getCode () {
+  return `
+import ReactTable from 'react-table'
 
-export default () => (
-  <div>
-    <Story />
-    <CodeHighlight>{() => source}</CodeHighlight>
-  </div>
+// 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/NoDataText.js

@@ -1,56 +0,0 @@
-import React from 'react'
-
-import ReactTable from '../src/index'
-
-class Story extends React.Component {
-  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 (
-      <div>
-        <div className='table-wrap'>
-          <ReactTable
-            className='-striped -highlight'
-            data={[]}
-            noDataText='Oh Noes!'
-            // noDataText={() => 'Oh Noes!'} // Supports functions
-            // noDataText={() => <span>Oh Noes!</span>} // Supports JSX / React Components
-            columns={columns}
-            defaultPageSize={10}
-          />
-        </div>
-        <div style={{textAlign: 'center'}}>
-          <br />
-          <em>Tip: Hold shift when sorting to multi-sort!</em>
-        </div>
-      </div>
-    )
-  }
-}
-
-// Source Code
-const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./NoDataText')
-
-export default () => (
-  <div>
-    <Story />
-    <CodeHighlight>{() => source}</CodeHighlight>
-  </div>
-)

stories/OneHundredKRows.js

@@ -2,95 +2,138 @@ import React from 'react'
 import _ from 'lodash'
 import namor from 'namor'
 
+import CodeHighlight from './components/codeHighlight'
 import ReactTable from '../src/index'
 
-class Story extends React.Component {
-  render () {
-    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)
-      }
-    })
+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
-      }]
+  const columns = [{
+    header: 'Name',
+    columns: [{
+      header: 'First Name',
+      accessor: 'firstName'
     }, {
-      Header: 'Info',
-      columns: [{
-        Header: 'Age',
-        accessor: 'age',
-        aggregate: vals => _.round(_.mean(vals)),
-        Aggregated: row => {
-          return <span>{row.value} (avg)</span>
-        }
-      }, {
-        Header: 'Visits',
-        accessor: 'visits',
-        aggregate: vals => _.sum(vals)
-      }]
+      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'>
+  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}
-            className='-striped -highlight'
-            defaultPageSize={10}
-            pivotBy={['firstName', 'lastName']}
+            defaultPageSize={3}
+            showPagination={false}
             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>
-                      )
-                    }}
-                  />
+                  <em>It even has access to the row data: </em>
+                  <CodeHighlight>{() => JSON.stringify(row, null, 2)}</CodeHighlight>
                 </div>
               )
             }}
           />
         </div>
-        <div style={{textAlign: 'center'}}>
-          <br />
-          <em>Tip: Hold shift when sorting to multi-sort!</em>
-        </div>
-      </div>
-    )
-  }
-}
-
-// Source Code
-const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./OneHundredKRows')
-
-export default () => (
-  <div>
-    <Story />
-    <CodeHighlight>{() => source}</CodeHighlight>
-  </div>
+      )
+    }}
+  />
 )
+  `
+}

stories/Pivoting.js

@@ -2,72 +2,120 @@ import React from 'react'
 import _ from 'lodash'
 import namor from 'namor'
 
+import CodeHighlight from './components/codeHighlight'
 import ReactTable from '../src/index'
 
-class Story extends React.Component {
-  render () {
-    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)
-      }
-    })
+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
-      }]
+  const columns = [{
+    header: 'Name',
+    columns: [{
+      header: 'First Name',
+      accessor: 'firstName'
     }, {
-      Header: 'Info',
-      columns: [{
-        Header: 'Age',
-        accessor: 'age',
-        aggregate: vals => _.round(_.mean(vals)),
-        Aggregated: row => {
-          return <span>{row.value} (avg)</span>
-        }
-      }, {
-        Header: 'Visits',
-        accessor: 'visits',
-        aggregate: vals => _.sum(vals)
-      }]
+      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'>
+  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}
-            className='-striped -highlight'
-            defaultPageSize={10}
-            pivotBy={['firstName', 'lastName']}
+            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 style={{textAlign: 'center'}}>
-          <br />
-          <em>Tip: Hold shift when sorting to multi-sort!</em>
-        </div>
-      </div>
-    )
-  }
-}
-
-// Source Code
-const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./Pivoting')
-
-export default () => (
-  <div>
-    <Story />
-    <CodeHighlight>{() => source}</CodeHighlight>
-  </div>
+      )
+    }}
+  />
 )
+  `
+}

stories/PivotingOptions.js

@@ -1,131 +0,0 @@
-import React from 'react'
-import _ from 'lodash'
-import namor from 'namor'
-
-import ReactTable from '../src/index'
-
-class Story extends React.Component {
-  render () {
-    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',
-        PivotValue: ({value}) => <span style={{color: 'darkred'}}>{value}</span>
-      }, {
-        Header: 'Last Name',
-        id: 'lastName',
-        accessor: d => d.lastName,
-        PivotValue: ({value}) => <span style={{color: 'darkblue'}}>{value}</span>,
-        Footer: () => <div style={{textAlign: 'center'}}><strong>Pivot Column Footer</strong></div>
-      }]
-    }, {
-      Header: 'Info',
-      columns: [{
-        Header: 'Age',
-        accessor: 'age',
-        aggregate: vals => {
-          return _.round(_.mean(vals))
-        },
-        Aggregated: row => <span>{row.value} (avg)</span>
-      }, {
-        Header: 'Visits',
-        accessor: 'visits',
-        aggregate: vals => _.sum(vals),
-        filterable: false
-      }]
-    }, {
-      pivot: true,
-      Header: () => <strong>Overridden Pivot Column Header Group</strong>
-    }, {
-      expander: true
-    }]
-
-    const subtableColumns = [{
-      Header: 'Name',
-      columns: [{
-        Header: 'First Name',
-        accessor: 'firstName'
-      }, {
-        Header: 'Last Name',
-        id: 'lastName'
-      }]
-    }, {
-      Header: 'Info',
-      columns: [{
-        Header: 'Age',
-        accessor: 'age'
-      }, {
-        Header: 'Visits',
-        accessor: 'visits'
-      }]
-    }]
-
-    return (
-      <div>
-        <div className='table-wrap'>
-          <ReactTable
-            data={data}
-            columns={columns}
-            defaultPageSize={10}
-            className='-striped -highlight'
-            pivotBy={['firstName', 'lastName']}
-            defaultSorted={[{id: 'firstName', desc: false}, {id: 'lastName', desc: true}]}
-            collapseOnSortingChange={false}
-            filterable
-            ExpanderComponent={({isExpanded, ...rest}) => (
-              isExpanded ? <span> &#10136; </span> : <span> &#10137; </span>
-            )}
-            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={subtableColumns}
-                    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>
-      </div>
-    )
-  }
-}
-
-// Source Code
-const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./PivotingOptions')
-
-export default () => (
-  <div>
-    <Story />
-    <CodeHighlight>{() => source}</CodeHighlight>
-  </div>
-)

stories/PivotingSubComponents.js

@@ -2,98 +2,138 @@ import React from 'react'
 import _ from 'lodash'
 import namor from 'namor'
 
+import CodeHighlight from './components/codeHighlight'
 import ReactTable from '../src/index'
 
-class Story extends React.Component {
-  render () {
-    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)
-      }
-    })
+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
-      }]
+  const columns = [{
+    header: 'Name',
+    columns: [{
+      header: 'First Name',
+      accessor: 'firstName'
     }, {
-      Header: 'Info',
-      columns: [{
-        Header: 'Age',
-        accessor: 'age',
-        aggregate: vals => _.round(_.mean(vals)),
-        Aggregated: row => {
-          return <span>{row.value} (avg)</span>
-        },
-        filterMethod: (filter, row) => (filter.value === `${row[filter.id]} (avg)`)
-      }, {
-        Header: 'Visits',
-        accessor: 'visits',
-        aggregate: vals => _.sum(vals),
-        filterable: false
-      }]
+      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'>
+  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={10}
-            className='-striped -highlight'
-            pivotBy={['firstName', 'lastName']}
-            filterable
+            defaultPageSize={3}
+            showPagination={false}
             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>
-                      )
-                    }}
-                  />
+                  <em>It even has access to the row data: </em>
+                  <CodeHighlight>{() => JSON.stringify(row, null, 2)}</CodeHighlight>
                 </div>
               )
             }}
           />
         </div>
-        <div style={{textAlign: 'center'}}>
-          <br />
-          <em>Tip: Hold shift when sorting to multi-sort!</em>
-        </div>
-      </div>
-    )
-  }
-}
-
-// Source Code
-const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./PivotingSubComponents')
-
-export default () => (
-  <div>
-    <Story />
-    <CodeHighlight>{() => source}</CodeHighlight>
-  </div>
+      )
+    }}
+  />
 )
+  `
+}

stories/ServerSide.js

@@ -2,6 +2,7 @@ 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 => {
@@ -13,34 +14,23 @@ const rawData = _.map(_.range(3424), d => {
 })
 
 // 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, sorted, filtered) => {
+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
-    let filteredData = rawData
-    if (filtered.length) {
-      filteredData = filtered.reduce(
-        (filteredSoFar, nextFilter) => {
-          return filteredSoFar.filter(
-            (row) => {
-              return (row[nextFilter.id] + '').includes(nextFilter.value)
-            })
-        }
-        , filteredData)
-    }
-    const sortedData = _.orderBy(filteredData, sorted.map(sort => {
+    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]
       }
-    }), sorted.map(d => d.desc ? 'desc' : 'asc'))
+    }), 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(filteredData.length / pageSize)
+      pages: Math.ceil(rawData.length / pageSize)
     }
 
     // Here we'll simulate a server response with 500ms of delay.
@@ -48,22 +38,22 @@ const requestData = (pageSize, page, sorted, filtered) => {
   })
 }
 
-class Story extends React.Component {
-  constructor () {
-    super()
-    this.state = {
+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
     }
-    this.fetchData = this.fetchData.bind(this)
-  }
+  },
   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.sorted, state.filtered)
+    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({
@@ -72,7 +62,7 @@ class Story extends React.Component {
           loading: false
         })
       })
-  }
+  },
   render () {
     return (
       <div>
@@ -80,41 +70,93 @@ class Story extends React.Component {
           <ReactTable
             className='-striped -highlight'
             columns={[{
-              Header: 'First Name',
+              header: 'First Name',
               accessor: 'firstName'
             }, {
-              Header: 'Last Name',
+              header: 'Last Name',
               id: 'lastName',
               accessor: d => d.lastName
             }, {
-              Header: 'Age',
+              header: 'Age',
               accessor: 'age'
             }]}
             manual // Forces table not to paginate or sort automatically, so we can handle it server-side
             defaultPageSize={10}
-            filterable
             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
-            onFetchData={this.fetchData} // Request new data when things change
+            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>
     )
   }
-}
-
-// Source Code
-const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./ServerSide')
+})
 
 export default () => (
-  <div>
-    <Story />
-    <CodeHighlight>{() => source}</CodeHighlight>
-  </div>
+  <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

@@ -2,68 +2,85 @@ import React from 'react'
 import _ from 'lodash'
 import namor from 'namor'
 
+import CodeHighlight from './components/codeHighlight'
 import ReactTable from '../src/index'
 
-class Story extends React.Component {
-  render () {
-    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),
-        children: _.map(_.range(10), d => {
-          return {
-            firstName: namor.generate({ words: 1, numLen: 0 }),
-            lastName: namor.generate({ words: 1, numLen: 0 }),
-            age: Math.floor(Math.random() * 30)
-          }
-        })
-      }
-    })
+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
-      }]
+  const columns = [{
+    header: 'Name',
+    columns: [{
+      header: 'First Name',
+      accessor: 'firstName'
     }, {
-      Header: 'Info',
-      columns: [{
-        Header: 'Age',
-        accessor: 'age'
-      }]
+      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>
+  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>
+  )
 }
 
-const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./Simple')
+function getCode () {
+  return `
+import ReactTable from 'react-table'
 
-export default () => (
-  <div>
-    <Story />
-    <CodeHighlight>{() => source}</CodeHighlight>
-  </div>
+// 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

@@ -2,144 +2,127 @@ import React from 'react'
 import _ from 'lodash'
 import namor from 'namor'
 
+import CodeHighlight from './components/codeHighlight'
 import ReactTable from '../src/index'
 
-class Story extends React.Component {
-  constructor (props) {
-    super(props)
-
-    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)
-      }
-    })
-
-    this.state = {
-      tableOptions: {
-        loading: false,
-        showPagination: true,
-        showPageSizeOptions: true,
-        showPageJump: true,
-        collapseOnSortingChange: true,
-        collapseOnPageChange: true,
-        collapseOnDataChange: true,
-        freezeWhenExpanded: false,
-        filterable: false,
-        sortable: true,
-        resizable: true
-      },
-      data: data
+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)
     }
+  })
 
-    this.setTableOption = this.setTableOption.bind(this)
-  }
-  render () {
-    const columns = [{
-      Header: 'Name',
-      columns: [{
-        Header: 'First Name',
-        accessor: 'firstName'
-      }, {
-        Header: 'Last Name',
-        id: 'lastName',
-        accessor: d => d.lastName
-      }]
+  const columns = [{
+    header: 'Name',
+    columns: [{
+      header: 'First Name',
+      accessor: 'firstName'
     }, {
-      Header: 'Info',
-      columns: [{
-        Header: 'Age',
-        accessor: 'age'
-      }]
+      header: 'Last Name',
+      id: 'lastName',
+      accessor: d => d.lastName
     }]
+  }, {
+    header: 'Info',
+    columns: [{
+      header: 'Age',
+      accessor: 'age'
+    }]
+  }]
 
-    return (
-      <div>
-        <div style={{float: 'left'}}>
-          <h1>Table Options</h1>
-          <table>
-            <tbody>
-              {
-                Object.keys(this.state.tableOptions).map(optionKey => {
-                  const optionValue = this.state.tableOptions[optionKey]
-                  return (
-                    <tr key={optionKey}>
-                      <td>{optionKey}</td>
-                      <td style={{paddingLeft: 10, paddingTop: 5}}>
-                        <input type='checkbox'
-                          name={optionKey}
-                          checked={optionValue}
-                          onChange={this.setTableOption}
-                        />
-                      </td>
-                    </tr>
-                  )
-                })
-              }
-            </tbody>
-          </table>
-        </div>
-        <div className='table-wrap' style={{paddingLeft: 240}}>
+  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
-            className='-striped -highlight'
-            data={this.state.data}
+            data={data}
             columns={columns}
-            defaultPageSize={10}
-            {...this.state.tableOptions}
+            defaultPageSize={3}
+            showPagination={false}
             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={this.state.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>
-                      )
-                    }}
-                  />
+                  <em>It even has access to the row data: </em>
+                  <CodeHighlight>{() => JSON.stringify(row, null, 2)}</CodeHighlight>
                 </div>
               )
             }}
           />
         </div>
-        <div style={{textAlign: 'center'}}>
-          <br />
-          <em>Tip: Hold shift when sorting to multi-sort!</em>
-        </div>
-      </div>
-    )
-  }
-
-  setTableOption (event) {
-    const target = event.target
-    const value = target.type === 'checkbox' ? target.checked : target.value
-    const name = target.name
-    this.setState({
-      tableOptions: {
-        ...this.state.tableOptions,
-        [name]: value
-      }
-    })
-  }
-}
-
-// Source Code
-const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./SubComponents')
-
-export default () => (
-  <div>
-    <Story />
-    <CodeHighlight>{() => source}</CodeHighlight>
-  </div>
+      )
+    }}
+  />
 )
+  `
+}

stories/SubRows.js

@@ -1,77 +0,0 @@
-import React from 'react'
-import _ from 'lodash'
-import namor from 'namor'
-
-import ReactTable from '../src/index'
-
-class Story extends React.Component {
-  render () {
-    const data = _.map(_.range(5553), d => {
-      const children = _.map(_.range(10), d => {
-        const grandChildren = _.map(_.range(10), d => {
-          return {
-            age: Math.floor(Math.random() * 30)
-          }
-        })
-        return {
-          firstName: namor.generate({ words: 1, numLen: 0 }),
-          age: Math.floor(Math.random() * 30),
-          children: grandChildren
-        }
-      })
-      return {
-        lastName: namor.generate({ words: 1, numLen: 0 }),
-        firstName: children.map(d => d.firstName),
-        age: Math.floor(Math.random() * 30),
-        children
-      }
-    })
-
-    const columns = [{
-      Header: 'Name',
-      columns: [{
-        Header: 'First Name',
-        accessor: 'firstName',
-        expander: true
-      }, {
-        Header: 'Last Name',
-        accessor: 'lastName'
-      }]
-    }, {
-      Header: 'Info',
-      columns: [{
-        Header: 'Age',
-        accessor: 'age'
-      }]
-    }]
-
-    return (
-      <div>
-        <div className='table-wrap'>
-          <ReactTable
-            className='-striped -highlight'
-            data={data}
-            columns={columns}
-            defaultPageSize={10}
-            subRowsKey='children'
-          />
-        </div>
-        <div style={{textAlign: 'center'}}>
-          <br />
-          <em>Tip: Hold shift when sorting to multi-sort!</em>
-        </div>
-      </div>
-    )
-  }
-}
-
-// Source Code
-const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./SubRows')
-
-export default () => (
-  <div>
-    <Story />
-    <CodeHighlight>{() => source}</CodeHighlight>
-  </div>
-)

umd.webpack.js

@@ -1,20 +0,0 @@
-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()
-  ]
-}