6.5.3

Fix onClick proxying and eslint
6.5.2
2026-08-19 08:20:30 +00:00 · 2017-08-02 13:39:42 -06:00 · 2017-08-02 13:39:34 -06:00 · 2017-08-02 13:25:44 -06:00 · 2017-08-02 13:16:54 -06:00 · 2017-08-02 13:15:16 -06:00
63 changed files with 10165 additions and 3805 deletions
@@ -0,0 +1,77 @@
+module.exports = {
+  parserOptions: {
+    ecmaVersion: 8,
+    ecmaFeatures: {
+      experimentalObjectRestSpread: true,
+      jsx: true,
+      node: false,
+      classes: true
+    },
+    sourceType: 'module'
+  },
+
+  parser: 'babel-eslint',
+
+  extends: ['standard'],
+
+  plugins: ['react'],
+
+  rules: {
+    // Nozzle
+    'jsx-quotes': [2, 'prefer-single'],
+    'comma-dangle': [2, 'always-multiline'],
+
+    // // React
+    'react/jsx-boolean-value': 2,
+    'react/jsx-curly-spacing': [2, 'never'],
+    'react/jsx-equals-spacing': [2, 'never'],
+    // 'react/jsx-indent': 2,
+    'react/jsx-indent-props': [2, 2],
+    'react/jsx-no-duplicate-props': 2,
+    'react/jsx-no-undef': 2,
+    'react/jsx-tag-spacing': [
+      2,
+      {
+        closingSlash: 'never',
+        beforeSelfClosing: 'always',
+        afterOpening: 'never'
+      }
+    ],
+    'react/jsx-uses-react': 2,
+    'react/jsx-uses-vars': 2,
+    'react/self-closing-comp': 2,
+    'react/jsx-no-bind': [
+      2,
+      {
+        allowArrowFunctions: true,
+        allowBind: false,
+        ignoreRefs: true
+      }
+    ],
+    'react/no-did-update-set-state': 2,
+    'react/no-unknown-property': 2,
+    'react/react-in-jsx-scope': 2,
+    'react/jsx-closing-bracket-location': [0, 'tag-aligned'],
+    'react/jsx-tag-spacing': [2, { beforeSelfClosing: 'always' }],
+    'react/jsx-wrap-multilines': 2,
+    'react/self-closing-comp': 2,
+    'react/jsx-key': 2,
+    'react/jsx-no-comment-textnodes': 2,
+    'react/jsx-no-duplicate-props': 2,
+    'react/jsx-no-target-blank': 2,
+    'react/jsx-no-undef': 2,
+    'react/jsx-uses-react': 2,
+    'react/jsx-uses-vars': 2,
+    'react/no-danger-with-children': 2,
+    'react/no-deprecated': 2,
+    'react/no-direct-mutation-state': 2,
+    'react/no-find-dom-node': 2,
+    'react/no-is-mounted': 2,
+    'react/no-render-return-value': 2,
+    'react/no-string-refs': 2,
+    'react/no-unknown-property': 2,
+    'react/react-in-jsx-scope': 2,
+    'react/require-render-return': 2
+    // 'react/jsx-max-props-per-line': [2, { maximum: 1 }]
+  }
+}
@@ -1,5 +1,6 @@
 node_modules/
 lib/
+docs/build
 react-table.js
 react-table.css
 *.log
@@ -1 +0,0 @@
-react-table.js.org
@@ -1,68 +0,0 @@
-import React from 'react'
-import { configure, storiesOf } from '@kadira/storybook'
-
-import './reset.css'
-import './fonts.css'
-import './layout.css'
-import '../stories/utils/prism.css'
-import 'github-markdown-css/github-markdown.css'
-import '../react-table.css'
-//
-import Readme from '../README.md'
-//
-import Simple from '../stories/Simple.js'
-import CellRenderers from '../stories/CellRenderers.js'
-import DefaultSorting from '../stories/DefaultSorting.js'
-import CustomSorting from '../stories/CustomSorting.js'
-import CustomWidths from '../stories/CustomWidths.js'
-import CustomComponentProps from '../stories/CustomComponentProps.js'
-import ServerSide from '../stories/ServerSide.js'
-import SubComponents from '../stories/SubComponents.js'
-import Pivoting from '../stories/Pivoting.js'
-import PivotingSubComponents from '../stories/PivotingSubComponents.js'
-import OneHundredKRows from '../stories/OneHundredKRows.js'
-import FunctionalRendering from '../stories/FunctionalRendering.js'
-import CustomExpanderPosition from '../stories/CustomExpanderPosition.js'
-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')
-    .add('Readme', () => {
-      const ReadmeCmp = React.createClass({
-        render () {
-          return <span className='markdown-body' dangerouslySetInnerHTML={{__html: Readme}} />
-        },
-        componentDidMount () {
-          global.Prism.highlightAll()
-        }
-      })
-      return <ReadmeCmp />
-    })
-  storiesOf('2. Demos')
-    .add('Simple Table', Simple)
-    .add('Cell Renderers & Custom Components', CellRenderers)
-    .add('Default Sorting', DefaultSorting)
-    .add('Custom Sorting', CustomSorting)
-    .add('Custom Column Widths', CustomWidths)
-    .add('Custom Component Props', CustomComponentProps)
-    .add('Server-side Data', ServerSide)
-    .add('Sub Components', SubComponents)
-    .add('Pivoting & Aggregation', Pivoting)
-    .add('Pivoting & Aggregation w/ Sub Components', PivotingSubComponents)
-    .add('100k Rows w/ Pivoting & Sub Components', OneHundredKRows)
-    .add('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)
@@ -1,18 +0,0 @@
-@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,600");
-body {
-  background: #fff;
-  font-family: 'Open Sans', sans-serif;
-  font-weight: 300;
-}
-
-h1 {
-  font-size: 24px;
-  font-weight: bold;
-  margin-bottom: 15px;
-  margin-top: 5px;
-}
-
-p {
-  margin-bottom: 15px;
-  line-height: 22px;
-}
@@ -1,7 +0,0 @@
-body{
-	padding: 20px;
-}
-
-strong {
-	font-weight: bold
-}
@@ -1,48 +0,0 @@
-/* http://meyerweb.com/eric/tools/css/reset/
-   v2.0 | 20110126
-   License: none (public domain)
-*/
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	font-size: 100%;
-	font: inherit;
-	vertical-align: baseline;
-}
-/* HTML5 display-role reset for older browsers */
-article, aside, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section {
-	display: block;
-}
-body {
-	line-height: 1;
-}
-/*ol, ul {
-	list-style: none;
-}*/
-blockquote, q {
-	quotes: none;
-}
-blockquote:before, blockquote:after,
-q:before, q:after {
-	content: '';
-	content: none;
-}
-table {
-	border-collapse: collapse;
-	border-spacing: 0;
-}
@@ -1,27 +0,0 @@
-const path = require('path')
-
-// load the default config generator.
-const genDefaultConfig = require('@kadira/storybook/dist/server/config/defaults/webpack.config.js')
-
-module.exports = (config, env) => {
-  config = genDefaultConfig(config, env)
-
-  Object.assign(config, {
-    module: Object.assign(config.module, {
-      loaders: config.module.loaders.concat([{
-        test: /\.md$/,
-        loader: 'html!markdown',
-        include: path.resolve(__dirname, '../')
-      }, {
-        test: /\.html$/,
-        loader: 'html',
-        query: {
-          minimize: true
-        },
-        include: path.resolve(__dirname, '../')
-      }])
-    })
-  })
-
-  return config
-}
@@ -1,3 +1,16 @@
+## 6.5.0
+##### New Features
+- `column.filterAll` - defaults to `false`, but when set to `true` will provide the entire array of rows to `filterMethod` as opposed to one row at a time. This allows for more fine-grained filtering using any method you can dream up. See the [Custom Filtering example](https://react-table.js.org/#/story/custom-filtering) for more info.
+
+## 6.4.0
+##### New Features
+- `PadRowComponent` - the content rendered inside of a padding row. Defaults to a react component that renders `&nbsp;`
+
+## 6.3.0
+##### New Features
+- `defaultSortDesc` - allows you to set the default sorting direction for all columns to descending.
+- `column.defaultSortDesc` - allows you to set the default sorting direction for a specific column. Falls back to the global `defaultSortDesc` when not set at all.
+
 ## 6.0.0

 ##### New Features
@@ -28,6 +28,11 @@
  <img alt="" src="https://img.shields.io/badge/%24-Donate-brightgreen.svg" />
 </a>

+<br />
+<br />
+
+[![Sponsor](https://app.codesponsor.io/embed/zpmS8V9r31sBSCeVzP7Wm6Sr/tannerlinsley/react-table.svg)](https://app.codesponsor.io/link/zpmS8V9r31sBSCeVzP7Wm6Sr/tannerlinsley/react-table)
+
 ## Versions
 This document refers to version 6.x.x of react-table.

@@ -46,7 +51,7 @@ Previous versions:

 ## 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/#/story/simple-table" target="\_parent">Storybook</a>

 ## Table of Contents
 - [Installation](#installation)
@@ -155,9 +160,12 @@ These are all of the available props (and their default values) for the main `<R
  data: [],
  loading: false,
  showPagination: true,
+  showPaginationTop: false,
+  showPaginationBottom: true
  showPageSizeOptions: true,
  pageSizeOptions: [5, 10, 20, 25, 50, 100],
  defaultPageSize: 20,
+  minRows: undefined,
  showPageJump: true,
  collapseOnSortingChange: true,
  collapseOnPageChange: true,
@@ -166,6 +174,7 @@ These are all of the available props (and their default values) for the main `<R
  sortable: true,
  resizable: true,
  filterable: false,
+  defaultSortDesc: false,
  defaultSorted: [],
  defaultFiltered: [],
  defaultResized: [],
@@ -191,6 +200,7 @@ These are all of the available props (and their default values) for the main `<R
    // returning 0, undefined or any falsey value will use subsequent sorts or the index as a tiebreaker
    return 0
  },
+  PadRowComponent: () => <span>&nbsp;</span>, // the content rendered inside of a padding row

  // Controlled State Overrides (see Fully Controlled Component section)
  page: undefined,
@@ -210,7 +220,7 @@ These are all of the available props (and their default values) for the main `<R

  // Pivoting
  pivotBy: undefined,
-  
+
  // Key Constants
  pivotValKey: '_pivotVal',
  pivotIDKey: '_pivotID',
@@ -282,8 +292,10 @@ These are all of the available props (and their default values) for the main `<R
    footerClassName: '',
    footerStyle: {},
    getFooterProps: () => ({}),
+    filterAll: false,
    filterMethod: undefined,
-    sortMethod: undefined
+    sortMethod: undefined,
+    defaultSortDesc: undefined,
  },

  // Global Expander Column Defaults
@@ -391,10 +403,11 @@ Or just define them as props
  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
+  filterMethod: (filter, row || rows, column) => {return true}, // A function returning a boolean that specifies the filtering logic for the column
+    // 'filter' == an object specifying which filter is being applied. Format: {id: [the filter column's id], value: [the value the user typed in the filter field], pivotId: [if filtering on a pivot column, the pivotId will be set to the pivot column's id and the `id` field will be set to the top level pivoting column]}
+    // 'row' || 'rows' == the row (or rows, if filterAll is set to true) of data supplied to the table
+    // 'column' == the column that the filter is on
+  filterAll: false
 }]
 ```

@@ -580,12 +593,21 @@ This makes it extremely easy to add, say... a row click callback!
 <ReactTable
  getTdProps={(state, rowInfo, column, instance) => {
    return {
-      onClick: e => {
+      onClick: (e, handleOriginal) => {
        console.log('A Td Element was clicked!')
        console.log('it produced this event:', e)
        console.log('It was in this column:', column)
        console.log('It was in this row:', rowInfo)
        console.log('It was in this table instance:', instance)
+
+        // IMPORTANT! React-Table uses onClick internally to trigger
+        // events like expanding SubComponents and pivots.
+        // By default a custom 'onClick' handler will override this functionality.
+        // If you want to fire the original onClick handler, call the
+        // 'handleOriginal' function.
+        if (handleOriginal) {
+          handleOriginal()
+        }
      }
    }
  }}
@@ -729,7 +751,7 @@ 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
+  sorted={[{ // the sorting model for the table
      id: 'lastName',
      desc: true
    }, {
@@ -758,7 +780,7 @@ Here are the props and their corresponding callbacks that control the state of t
  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.
+  onFilteredChange={(column, value) => {...}} // Called when a user enters a value into a filter input field or the value passed to the onFiltersChange handler by the Filter option.
  onResizedChange={(newResized, event) => {...}} // Called when a user clicks on a resizing component (the right edge of a column header)
 />
 ```
@@ -801,7 +823,11 @@ Accessing internal state and wrapping with more UI:
 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. 
+Sorting comes built in with React-Table.
+- Click a column header to sort by its accessor.
+- Click it again to reverse the sort.
+- Set `defaultSortDesc` property to `true` to make the first sort direction default to descending.
+- Override a specific column's default sort direction by using the same `defaultSortDesc` property on a column, set to `true`

 ## Multi-Sort
 When clicking on a column header, hold shift to multi-sort! You can toggle `ascending` `descending` and `none` for multi-sort columns. Clicking on a header without holding shift will clear the multi-sort and replace it with the single sort of that column. It's quite handy!
@@ -821,8 +847,8 @@ defaultSortMethod = (a, b) => {
  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
+  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
@@ -844,9 +870,13 @@ By default the table tries to filter by checking if the row's value starts with

 If you want to override a particular column's filtering method, you can set the `filterMethod` option on a column.

+By default, `filterMethod` is passed a single row of data at a time, and you are responsible for returning `true` or `false`, indicating whether it should be shown.
+
+Alternatively, you can set `filterAll` to `true`, and `filterMethod` will be passed the entire array of rows to be filtered, and you will then be responsible for returning the new filtered array. This is extremely handy when you need to utilize a utility like fuzzy matching that requires the entire array of items.
+
 To completely override the filter that is shown, you can set the `Filter` column option. Using this option you can specify the JSX that is shown. The option is passed an `onChange` method which must be called with the the value that you wan't to pass to the `filterMethod` option whenever the filter has changed.

-See <a href="http://react-table.js.org/?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.
+See <a href="http://react-table.js.org/#/story/custom-filtering" target="\_parent">Custom Filtering</a> demo for examples.

 ## Component Overrides
 Though we confidently stand by the markup and architecture behind it, `react-table` does offer the ability to change the core componentry it uses to render everything. You can extend or override these internal components by passing a react component to it's corresponding prop on either the global props or on a one-off basis like so:
@@ -891,19 +921,18 @@ To suggest a feature, create an issue if it does not already exist.
 If you would like to help develop a suggested feature follow these steps:

 - Fork this repo
- `$ yarn`
- `$ yarn run storybook`
+- Install dependencies with `$ yarn`
+- Auto-build files as you edit with `$ yarn run watch`
 - Implement your changes to files in the `src/` directory
- View changes as you code via our <a href="https://github.com/storybooks/react-storybook" target="\_parent">React Storybook</a> `localhost:8000`
- Make changes to stories in `/stories`, or create a new one if needed
+- Run the <a href="https://github.com/tannerlinsley/react-story">React Story</a> locally with `$ yarn run docs`
+- View changes as you edit `docs/src`,
 - Submit PR for review

 #### Scripts

- `$ yarn run storybook` Runs the storybook server
+- `$ yarn run watch` Watches files and builds via babel
+- `$ yarn run docs` Runs the storybook server
 - `$ yarn run test` Runs the test suite
- `$ yarn run prepublish` Builds the distributable bundle
- `$ yarn run docs` Builds the website/docs from the storybook for github pages

 ## Used By

@@ -0,0 +1,77 @@
+module.exports = {
+  parserOptions: {
+    ecmaVersion: 8,
+    ecmaFeatures: {
+      experimentalObjectRestSpread: true,
+      jsx: true,
+      node: false,
+      classes: true
+    },
+    sourceType: 'module'
+  },
+
+  parser: 'babel-eslint',
+
+  extends: ['standard'],
+
+  plugins: ['react'],
+
+  rules: {
+    // Nozzle
+    'jsx-quotes': [2, 'prefer-single'],
+    'comma-dangle': [2, 'always-multiline'],
+
+    // // React
+    'react/jsx-boolean-value': 2,
+    'react/jsx-curly-spacing': [2, 'never'],
+    'react/jsx-equals-spacing': [2, 'never'],
+    // 'react/jsx-indent': 2,
+    'react/jsx-indent-props': [2, 2],
+    'react/jsx-no-duplicate-props': 2,
+    'react/jsx-no-undef': 2,
+    'react/jsx-tag-spacing': [
+      2,
+      {
+        closingSlash: 'never',
+        beforeSelfClosing: 'always',
+        afterOpening: 'never'
+      }
+    ],
+    'react/jsx-uses-react': 2,
+    'react/jsx-uses-vars': 2,
+    'react/self-closing-comp': 2,
+    'react/jsx-no-bind': [
+      2,
+      {
+        allowArrowFunctions: true,
+        allowBind: false,
+        ignoreRefs: true
+      }
+    ],
+    'react/no-did-update-set-state': 2,
+    'react/no-unknown-property': 2,
+    'react/react-in-jsx-scope': 2,
+    'react/jsx-closing-bracket-location': [0, 'tag-aligned'],
+    'react/jsx-tag-spacing': [2, { beforeSelfClosing: 'always' }],
+    'react/jsx-wrap-multilines': 2,
+    'react/self-closing-comp': 2,
+    'react/jsx-key': 2,
+    'react/jsx-no-comment-textnodes': 2,
+    'react/jsx-no-duplicate-props': 2,
+    'react/jsx-no-target-blank': 2,
+    'react/jsx-no-undef': 2,
+    'react/jsx-uses-react': 2,
+    'react/jsx-uses-vars': 2,
+    'react/no-danger-with-children': 2,
+    'react/no-deprecated': 2,
+    'react/no-direct-mutation-state': 2,
+    'react/no-find-dom-node': 2,
+    'react/no-is-mounted': 2,
+    'react/no-render-return-value': 2,
+    'react/no-string-refs': 2,
+    'react/no-unknown-property': 2,
+    'react/react-in-jsx-scope': 2,
+    'react/require-render-return': 2
+    // 'react/jsx-max-props-per-line': [2, { maximum: 1 }]
+  }
+}
@@ -1 +0,0 @@
-react-table.js.org
@@ -1,22 +0,0 @@
-
-    <!DOCTYPE html>
-    <html>
-      <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <script>
-          if (window.parent !== window) {
-            window.__REACT_DEVTOOLS_GLOBAL_HOOK__ = window.parent.__REACT_DEVTOOLS_GLOBAL_HOOK__;
-          }
-        </script>
-        <title>React Storybook</title>
-        
-        
-      </head>
-      <body>
-        <div id="root"></div>
-        <div id="error-display"></div>
-        <script src="static/preview.b8deff9f16f0debf5b04.bundle.js"></script>
-      </body>
-    </html>
-  
@@ -1,44 +0,0 @@
-
-    <!DOCTYPE html>
-    <html>
-      <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <meta name="storybook-version" content="2.35.3">
-        <title>React Storybook</title>
-        <style>
-          /*
-            When resizing panels, the drag event breaks if the cursor
-            moves over the iframe. Add the 'dragging' class to the body
-            at drag start and remove it when the drag ends.
-           */
-          .dragging iframe {
-            pointer-events: none;
-          }
-
-          /* Styling the fuzzy search box placeholders */
-          .searchBox::-webkit-input-placeholder { /* Chrome/Opera/Safari */
-            color: #ddd;
-            font-size: 16px;
-          }
-
-          .searchBox::-moz-placeholder { /* Firefox 19+ */
-            color: #ddd;
-            font-size: 16px;
-          }
-
-          .searchBox:focus{
-            border-color: #EEE !important;
-          }
-
-          .btn:hover{
-            background-color: #eee
-          }
-        </style>
-      </head>
-      <body style="margin: 0;">
-        <div id="root"></div>
-        <script src="static/manager.4dc6928017acc8856e42.bundle.js"></script>
-      </body>
-    </html>
-  
@@ -0,0 +1,25 @@
+{
+  "name": "new",
+  "version": "0.1.0",
+  "private": true,
+  "devDependencies": {
+    "react-scripts": "0.9.5",
+    "standard": "^10.0.2"
+  },
+  "dependencies": {
+    "github-markdown-css": "^2.6.0",
+    "marked": "^0.3.6",
+    "namor": "^1.0.1",
+    "raw-loader": "^0.5.1",
+    "react": "^15.5.4",
+    "react-dom": "^15.5.4",
+    "react-json-tree": "^0.10.9",
+    "react-story": "^0.0.10"
+  },
+  "scripts": {
+    "start": "react-scripts start",
+    "build": "react-scripts build",
+    "test": "react-scripts test --env=jsdom",
+    "eject": "react-scripts eject"
+  }
+}
@@ -0,0 +1,31 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
+    <!--
+      Notice the use of %PUBLIC_URL% in the tag above.
+      It will be replaced with the URL of the `public` folder during the build.
+      Only files inside the `public` folder can be referenced from the HTML.
+
+      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
+      work correctly both with client-side routing and a non-root public URL.
+      Learn how to configure a non-root public URL by running `npm run build`.
+    -->
+    <title>React Table - A lightweight, fast and extendable datagrid built for React</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <!--
+      This HTML file is a template.
+      If you open it directly in the browser, you will see an empty page.
+
+      You can add webfonts, meta tags, or analytics to this file.
+      The build step will place the bundled scripts into the <body> tag.
+
+      To begin the development, run `npm start`.
+      To create a production bundle, use `npm run build`.
+    -->
+  </body>
+</html>
@@ -0,0 +1,110 @@
+import React from 'react'
+//
+import ReactStory, { defaultProps } from 'react-story'
+
+import './stories/utils/prism.css'
+import '../../react-table.css'
+
+import Readme from './stories/Readme.js'
+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'
+import SubComponents from './stories/SubComponents.js'
+import Pivoting from './stories/Pivoting.js'
+import PivotingSubComponents from './stories/PivotingSubComponents.js'
+import OneHundredKRows from './stories/OneHundredKRows.js'
+import FunctionalRendering from './stories/FunctionalRendering.js'
+import CustomExpanderPosition from './stories/CustomExpanderPosition.js'
+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 FixedHeader from './stories/FixedHeader.js'
+import MultiplePagers from './stories/MultiplePagers';
+
+export default class App extends React.Component {
+  render() {
+    return (
+      <ReactStory
+        style={{
+          display: 'block',
+          width: '100%',
+          height: '100%'
+        }}
+        pathPrefix="story/"
+        StoryWrapper={props => (
+          <defaultProps.StoryWrapper
+            css={{
+              padding: 0
+            }}
+          >
+            <a
+              href="//github.com/tannerlinsley/react-table"
+              style={{
+                display: 'block',
+                textAlign: 'center',
+                borderBottom: 'solid 3px #cccccc'
+              }}
+            >
+              <img
+                src="//npmcdn.com/react-table/media/Banner.png"
+                alt="React Table Logo"
+                style={{
+                  width: '100px'
+                }}
+              />
+            </a>
+            <div
+              {...props}
+              style={{
+                padding: '10px'
+              }}
+            />
+          </defaultProps.StoryWrapper>
+        )}
+        stories={[
+          { name: 'Readme', component: Readme },
+          { name: 'Simple Table', component: Simple },
+          {
+            name: 'Cell Renderers & Custom Components',
+            component: CellRenderers
+          },
+          { name: 'Default Sorting', component: DefaultSorting },
+          { name: 'Custom Sorting', component: CustomSorting },
+          { name: 'Custom Column Widths', component: CustomWidths },
+          { name: 'Custom Component Props', component: CustomComponentProps },
+          { name: 'Server-side Data', component: ServerSide },
+          { name: 'Sub Components', component: SubComponents },
+          { name: 'Pivoting & Aggregation', component: Pivoting },
+          {
+            name: 'Pivoting & Aggregation w/ Sub Components',
+            component: PivotingSubComponents
+          },
+          {
+            name: '100k Rows w/ Pivoting & Sub Components',
+            component: OneHundredKRows
+          },
+          { name: 'Pivoting Options', component: PivotingOptions },
+          { name: 'Functional Rendering', component: FunctionalRendering },
+          {
+            name: 'Custom Expander Position',
+            component: CustomExpanderPosition
+          },
+          { name: 'Custom "No Data" Text', component: NoDataText },
+          { name: 'Footers', component: Footers },
+          { name: 'Custom Filtering', component: Filtering },
+          { name: 'Controlled Component', component: ControlledTable },
+          { name: 'Editable Table', component: EditableTable },
+          { name: 'Fixed Header w/ Vertical Scroll', component: FixedHeader },
+          { name: 'Multiple Pagers (Top and Bottom)', component: MultiplePagers}
+        ]}
+      />
+    )
+  }
+}
@@ -0,0 +1,8 @@
+html, body, #root {
+  height: 100%
+}
+body {
+  margin: 0;
+  padding: 0;
+  font-family: sans-serif;
+}
@@ -0,0 +1,10 @@
+import React from 'react'
+import ReactDOM from 'react-dom'
+//
+import './index.css'
+import App from './App.js'
+
+ReactDOM.render(
+  <App />,
+  document.getElementById('root')
+)
@@ -1,16 +1,17 @@
+/* eslint-disable import/no-webpack-loader-syntax */
 import React from 'react'
 import _ from 'lodash'
 import namor from 'namor'

-import ReactTable from '../src/index'
+import ReactTable from '../../../lib/index'

-class Story extends React.Component {
+class Story extends React.PureComponent {
  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 }),
+        firstName: namor.generate({ words: 1, numbers: 0 }),
+        lastName: namor.generate({ words: 1, numbers: 0 }),
        progress: Math.floor(Math.random() * 100),
        status: statusChance > 0.66 ? 'relationship'
          : statusChance > 0.33 ? 'complicated'
@@ -98,7 +99,7 @@ class Story extends React.Component {

 // Source Code
 const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./CellRenderers')
+const source = require('!raw!./CellRenderers')

 export default () => (
  <div>
@@ -1,13 +1,14 @@
+/* eslint-disable import/no-webpack-loader-syntax */
 import React from 'react'
 import _ from 'lodash'
 import namor from 'namor'

-import ReactTable from '../src/index'
+import ReactTable from '../../../lib/index'

 const data = _.map(_.range(5553), d => {
  return {
-    firstName: namor.generate({ words: 1, numLen: 0 }),
-    lastName: namor.generate({ words: 1, numLen: 0 }),
+    firstName: namor.generate({ words: 1, numbers: 0 }),
+    lastName: namor.generate({ words: 1, numbers: 0 }),
    age: Math.floor(Math.random() * 30)
  }
 })
@@ -20,7 +21,8 @@ const columns = [{
  }, {
    Header: 'Last Name',
    id: 'lastName',
-    accessor: d => d.lastName
+    accessor: d => d.lastName,
+    width: 170
  }]
 }, {
  Header: 'Info',
@@ -30,21 +32,31 @@ const columns = [{
  }]
 }]

-class Story extends React.Component {
+function makeDefaultState()
+{
+  return {
+    sorted: [],
+    page: 0,
+    pageSize: 10,
+    expanded: {},
+    resized: [],
+    filtered: []
+  }
+}
+
+class Story extends React.PureComponent {
  constructor () {
    super()
-    this.state = {
-      sorted: [],
-      page: 0,
-      pageSize: 10,
-      expanded: {},
-      resized: [],
-      filtered: []
-    }
+    this.state = makeDefaultState()
+    this.resetState = this.resetState.bind(this)
+  }
+  resetState(){
+    this.setState(makeDefaultState())
  }
  render () {
    return (
      <div>
+
        <div className='table-wrap'>
          <ReactTable
            className='-striped -highlight'
@@ -69,6 +81,7 @@ class Story extends React.Component {
          />
        </div>
        <br />
+        <div style={{float:'right'}}><button onClick={this.resetState}>Reset State</button></div>
        <pre><code><strong>this.state ===</strong> {JSON.stringify(this.state, null, 2)}</code></pre>
        <br />
      </div>
@@ -78,7 +91,7 @@ class Story extends React.Component {

 // Source Code
 const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./ControlledTable')
+const source = require('!raw!./ControlledTable')

 export default () => (
  <div>
@@ -1,15 +1,16 @@
+/* eslint-disable import/no-webpack-loader-syntax */
 import React from 'react'
 import _ from 'lodash'
 import namor from 'namor'

-import ReactTable from '../src/index'
+import ReactTable from '../../../lib/index'

-class Story extends React.Component {
+class Story extends React.PureComponent {
  render () {
    const data = _.map(_.range(5553), d => {
      return {
-        firstName: namor.generate({ words: 1, numLen: 0 }),
-        lastName: namor.generate({ words: 1, numLen: 0 }),
+        firstName: namor.generate({ words: 1, numbers: 0 }),
+        lastName: namor.generate({ words: 1, numbers: 0 }),
        age: Math.floor(Math.random() * 30)
      }
    })
@@ -65,7 +66,7 @@ class Story extends React.Component {

 // Source Code
 const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./CustomComponentProps')
+const source = require('!raw!./CustomComponentProps')

 export default () => (
  <div>
@@ -1,15 +1,16 @@
+/* eslint-disable import/no-webpack-loader-syntax */
 import React from 'react'
 import _ from 'lodash'
 import namor from 'namor'

-import ReactTable from '../src/index'
+import ReactTable from '../../../lib/index'

-class Story extends React.Component {
+class Story extends React.PureComponent {
  render () {
    const data = _.map(_.range(5553), d => {
      return {
-        firstName: namor.generate({words: 1, numLen: 0}),
-        lastName: namor.generate({words: 1, numLen: 0}),
+        firstName: namor.generate({words: 1, numbers: 0}),
+        lastName: namor.generate({words: 1, numbers: 0}),
        age: Math.floor(Math.random() * 30)
      }
    })
@@ -70,7 +71,7 @@ class Story extends React.Component {

 // Source Code
 const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./CustomExpanderPosition')
+const source = require('!raw!./CustomExpanderPosition')

 export default () => (
  <div>
@@ -1,15 +1,16 @@
+/* eslint-disable import/no-webpack-loader-syntax */
 import React from 'react'
 import _ from 'lodash'
 import namor from 'namor'

-import ReactTable from '../src/index'
+import ReactTable from '../../../lib/index'

-class Story extends React.Component {
+class Story extends React.PureComponent {
  render () {
    const data = _.map(_.range(5553), d => {
      return {
-        firstName: namor.generate({ words: 1, numLen: 0 }),
-        lastName: namor.generate({ words: 1, numLen: 0 }),
+        firstName: namor.generate({ words: 1, numbers: 0 }),
+        lastName: namor.generate({ words: 1, numbers: 0 }),
        age: Math.floor(Math.random() * 30)
      }
    })
@@ -67,7 +68,7 @@ class Story extends React.Component {

 // Source Code
 const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./CustomSorting')
+const source = require('!raw!./CustomSorting')

 export default () => (
  <div>
@@ -1,15 +1,16 @@
+/* eslint-disable import/no-webpack-loader-syntax */
 import React from 'react'
 import _ from 'lodash'
 import namor from 'namor'

-import ReactTable from '../src/index'
+import ReactTable from '../../../lib/index'

-class Story extends React.Component {
+class Story extends React.PureComponent {
  render () {
    const data = _.map(_.range(5553), d => {
      return {
-        firstName: namor.generate({ words: 1, numLen: 0 }),
-        lastName: namor.generate({ words: 1, numLen: 0 }),
+        firstName: namor.generate({ words: 1, numbers: 0 }),
+        lastName: namor.generate({ words: 1, numbers: 0 }),
        age: Math.floor(Math.random() * 30)
      }
    })
@@ -56,7 +57,7 @@ class Story extends React.Component {

 // Source Code
 const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./CustomWidths')
+const source = require('!raw!./CustomWidths')

 export default () => (
  <div>
@@ -1,15 +1,16 @@
+/* eslint-disable import/no-webpack-loader-syntax */
 import React from 'react'
 import _ from 'lodash'
 import namor from 'namor'

-import ReactTable from '../src/index'
+import ReactTable from '../../../lib/index'

-class Story extends React.Component {
+class Story extends React.PureComponent {
  render () {
    const data = _.map(_.range(5553), d => {
      return {
-        firstName: namor.generate({ words: 1, numLen: 0 }),
-        lastName: namor.generate({ words: 1, numLen: 0 }),
+        firstName: namor.generate({ words: 1, numbers: 0 }),
+        lastName: namor.generate({ words: 1, numbers: 0 }),
        age: Math.floor(Math.random() * 30)
      }
    })
@@ -57,7 +58,7 @@ class Story extends React.Component {

 // Source Code
 const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./DefaultSorting')
+const source = require('!raw!./DefaultSorting')

 export default () => (
  <div>
@@ -1,8 +1,9 @@
+/* eslint-disable import/no-webpack-loader-syntax */
 import React from 'react'

-import ReactTable from '../src/index'
+import ReactTable from '../../../lib/index'

-class Story extends React.Component {
+class Story extends React.PureComponent {
  constructor (props, context) {
    super(props, context)
    this.renderEditable = this.renderEditable.bind(this)
@@ -59,7 +60,7 @@ class Story extends React.Component {

 // Source Code
 const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./EditableTable')
+const source = require('!raw!./EditableTable')

 export default () => (
  <div>
@@ -0,0 +1,236 @@
+/* eslint-disable import/no-webpack-loader-syntax */
+import React from 'react'
+import _ from 'lodash'
+import namor from 'namor'
+import matchSorter from 'match-sorter'
+
+import CodeHighlight from './components/codeHighlight'
+
+import ReactTable from '../../../lib/index'
+
+class Story extends React.PureComponent {
+  constructor(props) {
+    super(props)
+
+    const data = _.map(_.range(5553), d => {
+      return {
+        firstName: namor.generate({ words: 1, numbers: 0 }),
+        lastName: namor.generate({ words: 1, numbers: 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, rows) =>
+              matchSorter(rows, filter.value, { keys: ['lastName'] }),
+            filterAll: true
+          }
+        ]
+      },
+      {
+        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>
+          <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">
+          <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 using{' '}
+            <a href="https://github.com/kentcdodds">Kent C. Dodd</a>'s{' '}
+            <a href="https://github.com/kentcdodds/match-sorter">
+              match-sorter
+            </a>{' '}
+            fuzzy search module. Note that 'filterAll' is set to true, which
+            allows us to filter using the entire dataset instead of just one row
+            at a time.
+          </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!./Filtering')
+
+export default () =>
+  <div>
+    <Story />
+    <CodeHighlight>
+      {() => source}
+    </CodeHighlight>
+  </div>
@@ -0,0 +1,81 @@
+/* eslint-disable import/no-webpack-loader-syntax */
+import React from 'react'
+import _ from 'lodash'
+import namor from 'namor'
+
+import ReactTable from '../../../lib/index'
+
+class Story extends React.PureComponent {
+  render() {
+    const data = _.map(_.range(5553), d => {
+      return {
+        firstName: namor.generate({ words: 1, numbers: 0 }),
+        lastName: namor.generate({ words: 1, numbers: 0 }),
+        age: Math.floor(Math.random() * 30),
+        children: _.map(_.range(10), d => {
+          return {
+            firstName: namor.generate({ words: 1, numbers: 0 }),
+            lastName: namor.generate({ words: 1, numbers: 0 }),
+            age: Math.floor(Math.random() * 30)
+          }
+        })
+      }
+    })
+
+    const columns = [
+      {
+        Header: 'Name',
+        columns: [
+          {
+            Header: 'First Name',
+            accessor: 'firstName'
+          },
+          {
+            Header: 'Last Name',
+            id: 'lastName',
+            accessor: d => d.lastName
+          }
+        ]
+      },
+      {
+        Header: 'Info',
+        columns: [
+          {
+            Header: 'Age',
+            accessor: 'age'
+          }
+        ]
+      }
+    ]
+
+    return (
+      <div>
+        <div className="table-wrap">
+          <ReactTable
+            className="-striped -highlight"
+            data={data}
+            columns={columns}
+            defaultPageSize={20}
+            style={{
+              height: '400px' // This will force the table body to overflow and scroll, since there is not enough room
+            }}
+          />
+        </div>
+        <div style={{ textAlign: 'center' }}>
+          <br />
+          <em>Tip: Hold shift when sorting to multi-sort!</em>
+        </div>
+      </div>
+    )
+  }
+}
+
+const CodeHighlight = require('./components/codeHighlight').default
+const source = require('!raw!./FixedHeader')
+
+export default () => (
+  <div>
+    <Story />
+    <CodeHighlight>{() => source}</CodeHighlight>
+  </div>
+)
@@ -1,15 +1,16 @@
+/* eslint-disable import/no-webpack-loader-syntax */
 import React from 'react'
 import _ from 'lodash'
 import namor from 'namor'

-import ReactTable from '../src/index'
+import ReactTable from '../../../lib/index'

-class Story extends React.Component {
+class Story extends React.PureComponent {
  render () {
    const data = _.map(_.range(5553), d => {
      return {
-        firstName: namor.generate({ words: 1, numLen: 0 }),
-        lastName: namor.generate({ words: 1, numLen: 0 }),
+        firstName: namor.generate({ words: 1, numbers: 0 }),
+        lastName: namor.generate({ words: 1, numbers: 0 }),
        age: Math.floor(Math.random() * 30)
      }
    })
@@ -81,7 +82,7 @@ class Story extends React.Component {

 // Source Code
 const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./Footers')
+const source = require('!raw!./Footers')

 export default () => (
  <div>
@@ -1,9 +1,10 @@
+/* eslint-disable import/no-webpack-loader-syntax */
 import React from 'react'
 import _ from 'lodash'
 import namor from 'namor'
 import JSONTree from 'react-json-tree'

-import ReactTable from '../src/index'
+import ReactTable from '../../../lib/index'

 const JSONtheme = {
  scheme: 'monokai',
@@ -26,12 +27,12 @@ const JSONtheme = {
  base0F: '#cc6633'
 }

-class Story extends React.Component {
+class Story extends React.PureComponent {
  render () {
    const data = _.map(_.range(5553), d => {
      return {
-        firstName: namor.generate({ words: 1, numLen: 0 }),
-        lastName: namor.generate({ words: 1, numLen: 0 }),
+        firstName: namor.generate({ words: 1, numbers: 0 }),
+        lastName: namor.generate({ words: 1, numbers: 0 }),
        age: Math.floor(Math.random() * 30)
      }
    })
@@ -126,7 +127,7 @@ class Story extends React.Component {

 // Source Code
 const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./FunctionalRendering')
+const source = require('!raw!./FunctionalRendering')

 export default () => (
  <div>
@@ -1,20 +1,21 @@
+/* eslint-disable import/no-webpack-loader-syntax */
 import React from 'react'
 import _ from 'lodash'
 import namor from 'namor'

-import ReactTable from '../src/index'
+import ReactTable from '../../../lib/index'

-class Story extends React.Component {
+class Story extends React.PureComponent {
  render () {
    const data = _.map(_.range(5553), d => {
      return {
-        firstName: namor.generate({ words: 1, numLen: 0 }),
-        lastName: namor.generate({ words: 1, numLen: 0 }),
+        firstName: namor.generate({ words: 1, numbers: 0 }),
+        lastName: namor.generate({ words: 1, numbers: 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 }),
+            firstName: namor.generate({ words: 1, numbers: 0 }),
+            lastName: namor.generate({ words: 1, numbers: 0 }),
            age: Math.floor(Math.random() * 30)
          }
        })
@@ -47,6 +48,9 @@ class Story extends React.Component {
            data={data}
            columns={columns}
            defaultPageSize={10}
+            showPagination
+            showPaginationTop
+            showPaginationBottom
          />
        </div>
        <div style={{textAlign: 'center'}}>
@@ -59,7 +63,7 @@ class Story extends React.Component {
 }

 const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./Simple')
+const source = require('!raw!./MultiplePagers')

 export default () => (
  <div>
@@ -1,8 +1,9 @@
+/* eslint-disable import/no-webpack-loader-syntax */
 import React from 'react'

-import ReactTable from '../src/index'
+import ReactTable from '../../../lib/index'

-class Story extends React.Component {
+class Story extends React.PureComponent {
  render () {
    const columns = [{
      Header: 'Name',
@@ -46,7 +47,7 @@ class Story extends React.Component {

 // Source Code
 const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./NoDataText')
+const source = require('!raw!./NoDataText')

 export default () => (
  <div>
@@ -1,15 +1,16 @@
+/* eslint-disable import/no-webpack-loader-syntax */
 import React from 'react'
 import _ from 'lodash'
 import namor from 'namor'

-import ReactTable from '../src/index'
+import ReactTable from '../../../lib/index'

-class Story extends React.Component {
+class Story extends React.PureComponent {
  render () {
    const data = _.map(_.range(100000), d => {
      return {
-        firstName: namor.generate({ words: 1, numLen: 0 }),
-        lastName: namor.generate({ words: 1, numLen: 0 }),
+        firstName: namor.generate({ words: 1, numbers: 0 }),
+        lastName: namor.generate({ words: 1, numbers: 0 }),
        age: Math.floor(Math.random() * 30),
        visits: Math.floor(Math.random() * 100)
      }
@@ -86,7 +87,7 @@ class Story extends React.Component {

 // Source Code
 const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./OneHundredKRows')
+const source = require('!raw!./OneHundredKRows')

 export default () => (
  <div>
@@ -1,15 +1,16 @@
+/* eslint-disable import/no-webpack-loader-syntax */
 import React from 'react'
 import _ from 'lodash'
 import namor from 'namor'

-import ReactTable from '../src/index'
+import ReactTable from '../../../lib/index'

-class Story extends React.Component {
+class Story extends React.PureComponent {
  render () {
    const data = _.map(_.range(1000), d => {
      return {
-        firstName: namor.generate({ words: 1, numLen: 0 }),
-        lastName: namor.generate({ words: 1, numLen: 0 }),
+        firstName: namor.generate({ words: 1, numbers: 0 }),
+        lastName: namor.generate({ words: 1, numbers: 0 }),
        age: Math.floor(Math.random() * 30),
        visits: Math.floor(Math.random() * 100)
      }
@@ -63,7 +64,7 @@ class Story extends React.Component {

 // Source Code
 const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./Pivoting')
+const source = require('!raw!./Pivoting')

 export default () => (
  <div>
@@ -1,15 +1,16 @@
+/* eslint-disable import/no-webpack-loader-syntax */
 import React from 'react'
 import _ from 'lodash'
 import namor from 'namor'

-import ReactTable from '../src/index'
+import ReactTable from '../../../lib/index'

-class Story extends React.Component {
+class Story extends React.PureComponent {
  render () {
    const data = _.map(_.range(1000), d => {
      return {
-        firstName: namor.generate({words: 1, numLen: 0}),
-        lastName: namor.generate({words: 1, numLen: 0}),
+        firstName: namor.generate({words: 1, numbers: 0}),
+        lastName: namor.generate({words: 1, numbers: 0}),
        age: Math.floor(Math.random() * 30),
        visits: Math.floor(Math.random() * 100)
      }
@@ -121,7 +122,7 @@ class Story extends React.Component {

 // Source Code
 const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./PivotingOptions')
+const source = require('!raw!./PivotingOptions')

 export default () => (
  <div>
@@ -1,15 +1,16 @@
+/* eslint-disable import/no-webpack-loader-syntax */
 import React from 'react'
 import _ from 'lodash'
 import namor from 'namor'

-import ReactTable from '../src/index'
+import ReactTable from '../../../lib/index'

-class Story extends React.Component {
+class Story extends React.PureComponent {
  render () {
    const data = _.map(_.range(1000), d => {
      return {
-        firstName: namor.generate({ words: 1, numLen: 0 }),
-        lastName: namor.generate({ words: 1, numLen: 0 }),
+        firstName: namor.generate({ words: 1, numbers: 0 }),
+        lastName: namor.generate({ words: 1, numbers: 0 }),
        age: Math.floor(Math.random() * 30),
        visits: Math.floor(Math.random() * 100)
      }
@@ -89,7 +90,7 @@ class Story extends React.Component {

 // Source Code
 const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./PivotingSubComponents')
+const source = require('!raw!./PivotingSubComponents')

 export default () => (
  <div>
@@ -0,0 +1,20 @@
+/* eslint-disable import/no-webpack-loader-syntax */
+import React from 'react'
+import marked from 'marked'
+//
+import Readme from '!raw!../../../README.md'
+import 'github-markdown-css/github-markdown.css'
+
+export default class Story extends React.Component {
+  render() {
+    return (
+      <span
+        className="markdown-body"
+        dangerouslySetInnerHTML={{ __html: marked(Readme) }}
+      />
+    )
+  }
+  componentDidMount() {
+    global.Prism.highlightAll()
+  }
+}
@@ -1,13 +1,14 @@
+/* eslint-disable import/no-webpack-loader-syntax */
 import React from 'react'
 import _ from 'lodash'
 import namor from 'namor'

-import ReactTable from '../src/index'
+import ReactTable from '../../../lib/index'

 const rawData = _.map(_.range(3424), d => {
  return {
-    firstName: namor.generate({ words: 1, numLen: 0 }),
-    lastName: namor.generate({ words: 1, numLen: 0 }),
+    firstName: namor.generate({ words: 1, numbers: 0 }),
+    lastName: namor.generate({ words: 1, numbers: 0 }),
    age: Math.floor(Math.random() * 30)
  }
 })
@@ -48,7 +49,7 @@ const requestData = (pageSize, page, sorted, filtered) => {
  })
 }

-class Story extends React.Component {
+class Story extends React.PureComponent {
  constructor () {
    super()
    this.state = {
@@ -110,7 +111,7 @@ class Story extends React.Component {

 // Source Code
 const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./ServerSide')
+const source = require('!raw!./ServerSide')

 export default () => (
  <div>
@@ -0,0 +1,77 @@
+/* eslint-disable import/no-webpack-loader-syntax */
+import React from 'react'
+import _ from 'lodash'
+import namor from 'namor'
+
+import ReactTable from '../../../lib/index'
+
+class Story extends React.PureComponent {
+  render() {
+    const data = _.map(_.range(5553), d => {
+      return {
+        firstName: namor.generate({ words: 1, numbers: 0 }),
+        lastName: namor.generate({ words: 1, numbers: 0 }),
+        age: Math.floor(Math.random() * 30),
+        children: _.map(_.range(10), d => {
+          return {
+            firstName: namor.generate({ words: 1, numbers: 0 }),
+            lastName: namor.generate({ words: 1, numbers: 0 }),
+            age: Math.floor(Math.random() * 30)
+          }
+        })
+      }
+    })
+
+    const columns = [
+      {
+        Header: 'Name',
+        columns: [
+          {
+            Header: 'First Name',
+            accessor: 'firstName'
+          },
+          {
+            Header: 'Last Name',
+            id: 'lastName',
+            accessor: d => d.lastName
+          }
+        ]
+      },
+      {
+        Header: 'Info',
+        columns: [
+          {
+            Header: 'Age',
+            accessor: 'age'
+          }
+        ]
+      }
+    ]
+
+    return (
+      <div>
+        <div className="table-wrap">
+          <ReactTable
+            className="-striped -highlight"
+            data={data}
+            columns={columns}
+            defaultPageSize={10}
+          />
+        </div>
+        <div style={{ textAlign: 'center' }}>
+          <br />
+          <em>Tip: Hold shift when sorting to multi-sort!</em>
+        </div>
+      </div>
+    )
+  }
+}
+
+const CodeHighlight = require('./components/codeHighlight').default
+const source = require('!raw!./Simple')
+
+export default () =>
+  <div>
+    <Story />
+    <CodeHighlight>{() => source}</CodeHighlight>
+  </div>
@@ -1,17 +1,18 @@
+/* eslint-disable import/no-webpack-loader-syntax */
 import React from 'react'
 import _ from 'lodash'
 import namor from 'namor'

-import ReactTable from '../src/index'
+import ReactTable from '../../../lib/index'

-class Story extends React.Component {
+class Story extends React.PureComponent {
  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}),
+        firstName: namor.generate({words: 1, numbers: 0}),
+        lastName: namor.generate({words: 1, numbers: 0}),
        age: Math.floor(Math.random() * 30)
      }
    })
@@ -56,7 +57,7 @@ class Story extends React.Component {

    return (
      <div>
-        <div style={{float: 'left'}}>
+        <div>
          <h1>Table Options</h1>
          <table>
            <tbody>
@@ -80,7 +81,7 @@ class Story extends React.Component {
            </tbody>
          </table>
        </div>
-        <div className='table-wrap' style={{paddingLeft: 240}}>
+        <div className='table-wrap'>
          <ReactTable
            className='-striped -highlight'
            data={this.state.data}
@@ -135,7 +136,7 @@ class Story extends React.Component {

 // Source Code
 const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./SubComponents')
+const source = require('!raw!./SubComponents')

 export default () => (
  <div>
@@ -1,10 +1,11 @@
+/* eslint-disable import/no-webpack-loader-syntax */
 import React from 'react'
 import _ from 'lodash'
 import namor from 'namor'

-import ReactTable from '../src/index'
+import ReactTable from '../../../lib/index'

-class Story extends React.Component {
+class Story extends React.PureComponent {
  render () {
    const data = _.map(_.range(5553), d => {
      const children = _.map(_.range(10), d => {
@@ -14,13 +15,13 @@ class Story extends React.Component {
          }
        })
        return {
-          firstName: namor.generate({ words: 1, numLen: 0 }),
+          firstName: namor.generate({ words: 1, numbers: 0 }),
          age: Math.floor(Math.random() * 30),
          children: grandChildren
        }
      })
      return {
-        lastName: namor.generate({ words: 1, numLen: 0 }),
+        lastName: namor.generate({ words: 1, numbers: 0 }),
        firstName: children.map(d => d.firstName),
        age: Math.floor(Math.random() * 30),
        children
@@ -67,7 +68,7 @@ class Story extends React.Component {

 // Source Code
 const CodeHighlight = require('./components/codeHighlight').default
-const source = require('!raw-loader!./SubRows')
+const source = require('!raw!./SubRows')

 export default () => (
  <div>
@@ -1,7 +1,7 @@
 import React from 'react'
 import '../utils/prism'

-export default React.createClass({
+export default class CodeHighlight extends React.Component {
  render () {
    const { language, children } = this.props
    return (
@@ -11,11 +11,11 @@ export default React.createClass({
        </code>
      </pre>
    )
-  },
+  }
  componentDidMount () {
    window.Prism.highlightAll()
-  },
+  }
  componentDidUpdate () {
    window.Prism.highlightAll()
  }
-})
+}
@@ -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":""}
@@ -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":""}
@@ -1,6 +1,6 @@
 {
  "name": "react-table",
-  "version": "6.0.1",
+  "version": "6.5.3",
  "description": "A fast, lightweight, opinionated table and datagrid built on React",
  "license": "MIT",
  "homepage": "https://github.com/tannerlinsley/react-table#readme",
@@ -29,56 +29,39 @@
    "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",
+    "test": "eslint src",
    "umd": "rimraf react-table.js && webpack --config umd.webpack.js",
    "build": "npm-run-all build:*",
    "prepublish": "npm run build && npm run umd",
    "postpublish": "git push --tags",
-    "storybook": "start-storybook -p 8000 -c .storybook",
-    "docs": "build-storybook -o docs && cp .storybook/CNAME docs/CNAME"
+    "docs": "yarn watch & cd docs && yarn && yarn start",
+    "docs:build": "yarn build && cd docs && yarn && yarn run build"
  },
  "dependencies": {
-    "classnames": "^2.2.5",
-    "raw-loader": "^0.5.1"
+    "classnames": "^2.2.5"
  },
  "peerDependencies": {
    "react": "^15.x.x"
  },
  "devDependencies": {
-    "@kadira/storybook": "^2.35.1",
    "autoprefixer": "^6.7.0",
    "babel-cli": "6.14.0",
    "babel-eslint": "6.1.2",
    "babel-preset-es2015": "6.14.0",
    "babel-preset-react": "6.11.1",
    "babel-preset-stage-2": "6.13.0",
-    "github-markdown-css": "^2.4.1",
-    "html-loader": "^0.4.4",
-    "markdown-loader": "^0.1.7",
-    "namor": "^0.3.0",
+    "eslint": "^4.1.1",
+    "match-sorter": "^1.8.0",
    "npm-run-all": "^3.1.1",
    "onchange": "^3.0.2",
    "postcss-cli": "^2.6.0",
    "react": "^15.4.2",
    "react-dom": "^15.4.2",
-    "react-json-tree": "^0.10.1",
+    "react-json-tree": "^0.10.9",
    "rimraf": "^2.6.1",
-    "standard": "^8.0.0",
-    "storybook": "^0.0.0",
+    "standard": "^10.0.2",
    "stylus": "^0.54.5",
-    "webpack": "^2.4.1"
-  },
-  "standard": {
-    "parser": "babel-eslint",
-    "ignore": [
-      "node_modules",
-      "dist",
-      "lib",
-      "example",
-      "react-table.js",
-      "stories",
-      "docs"
-    ]
+    "webpack": "^2.5.1"
  },
  "babel": {
    "presets": [
@@ -11,6 +11,8 @@ export default {
  data: [],
  loading: false,
  showPagination: true,
+  showPaginationTop: false,
+  showPaginationBottom: true,
  showPageSizeOptions: true,
  pageSizeOptions: [5, 10, 20, 25, 50, 100],
  defaultPageSize: 20,
@@ -22,18 +24,21 @@ export default {
  sortable: true,
  resizable: true,
  filterable: false,
+  defaultSortDesc: false,
  defaultSorted: [],
  defaultFiltered: [],
  defaultResized: [],
  defaultExpanded: {},
  defaultFilterMethod: (filter, row, column) => {
    const id = filter.pivotId || filter.id
-    return row[id] !== undefined ? String(row[id]).startsWith(filter.value) : true
+    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
+    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
@@ -140,7 +145,8 @@ export default {
    footerStyle: {},
    getFooterProps: emptyObj,
    filterMethod: undefined,
-    sortMethod: undefined
+    filterAll: false,
+    sortMethod: undefined,
  },

  // Global Expander Column Defaults
@@ -148,7 +154,7 @@ export default {
    sortable: false,
    resizable: false,
    filterable: false,
-    width: 35
+    width: 35,
  },

  pivotDefaults: {
@@ -165,12 +171,12 @@ export default {
  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}) => {
+  TableComponent: _.makeTemplateComponent('rt-table', 'Table'),
+  TheadComponent: _.makeTemplateComponent('rt-thead', 'Thead'),
+  TbodyComponent: _.makeTemplateComponent('rt-tbody', 'Tbody'),
+  TrGroupComponent: _.makeTemplateComponent('rt-tr-group', 'TrGroup'),
+  TrComponent: _.makeTemplateComponent('rt-tr', 'Tr'),
+  ThComponent: ({ toggleSort, className, children, ...rest }) => {
    return (
      <div
        className={classnames(className, 'rt-th')}
@@ -183,33 +189,38 @@ export default {
      </div>
    )
  },
-  TdComponent: _.makeTemplateComponent('rt-td'),
-  TfootComponent: _.makeTemplateComponent('rt-tfoot'),
-  FilterComponent: ({filter, onChange}) => (
-    <input type='text'
+  TdComponent: _.makeTemplateComponent('rt-td', 'Td'),
+  TfootComponent: _.makeTemplateComponent('rt-tfoot', 'Tfoot'),
+  FilterComponent: ({ filter, onChange }) =>
+    <input
+      type='text'
      style={{
-        width: '100%'
+        width: '100%',
      }}
      value={filter ? filter.value : ''}
-      onChange={(event) => onChange(event.target.value)}
-    />
-  ),
-  ExpanderComponent: ({isExpanded}) => (
+      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}) => {
+    </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>
-      ))
+      .map((row, i) =>
+        <span key={i}>
+          {row[column.id]}
+          {i < subRows.length - 1 ? ', ' : ''}
+        </span>
+      )
    return (
-      <span>{previewValues}</span>
+      <span>
+        {previewValues}
+      </span>
    )
  },
  PivotComponent: undefined, // this is a computed default generated using
@@ -217,19 +228,16 @@ export default {
  PaginationComponent: Pagination,
  PreviousComponent: undefined,
  NextComponent: undefined,
-  LoadingComponent: ({className, loading, loadingText, ...rest}) => (
-    <div className={classnames(
-      '-loading',
-      {'-active': loading},
-      className
-    )}
+  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')
+    </div>,
+  NoDataComponent: _.makeTemplateComponent('rt-noData', 'NoData'),
+  ResizerComponent: _.makeTemplateComponent('rt-resizer', 'Resizer'),
+  PadRowComponent: () => <span>&nbsp;</span>,
 }
@@ -4,10 +4,13 @@ $expandSize = 7px

 .ReactTable
  position:relative
+  display: flex
+  flex-direction: column
  border: 1px solid alpha(black, .1)
  *
    box-sizing: border-box
  .rt-table
+    flex: 1
    display: flex
    flex-direction: column
    align-items: stretch
@@ -16,6 +19,7 @@ $expandSize = 7px
    overflow: auto

  .rt-thead
+    flex: 1 0 auto
    display: flex
    flex-direction: column
    -webkit-user-select: none;
@@ -91,8 +95,10 @@ $expandSize = 7px
      margin-top: -10px

  .rt-tbody
+    flex: 99999 1 auto
    display: flex
    flex-direction: column
+    overflow: auto
    // z-index:0
    .rt-tr-group
      border-bottom: solid 1px alpha(black, .05)
@@ -105,10 +111,12 @@ $expandSize = 7px
    .rt-expandable
      cursor: pointer
  .rt-tr-group
+    flex: 1 0 auto
    display: flex
    flex-direction: column
    align-items: stretch
  .rt-tr
+    flex: 1 0 auto
    display: inline-flex
  .rt-th
  .rt-td
@@ -191,7 +199,7 @@ $expandSize = 7px
      appearance:none
      display:block
      width:100%
-      height: 100%
+      height:100%
      border: 0
      border-radius: 3px
      padding: 6px
@@ -261,7 +269,7 @@ $expandSize = 7px
    bottom:0
    background: alpha(white, .8)
    transition: all .3s ease
-    z-index: 2
+    z-index: -1
    opacity: 0
    pointer-events: none

@@ -279,6 +287,7 @@ $expandSize = 7px

    &.-active
      opacity: 1
+      z-index: 2
      pointer-events: all
      > div
        transform: translateY(50%)
@@ -293,26 +302,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
-    select
-      padding: 5px 15px 5px 7px
-      min-width:100px
-    &:after
-      content: ''
-      position: absolute
-      right: 8px
-      top: 50%
-      transform: translate(0, -50%)
-      border-color: #999 transparent transparent
-      border-style: solid
-      border-width: 5px 5px 2.5px
-
  .rt-resizing
    .rt-th
    .rt-td
@@ -1,101 +1,134 @@
-export default Base => class extends Base {
-
-  componentWillMount () {
-    this.setStateWithData(this.getDataModel(this.getResolvedState()))
-  }
-
-  componentDidMount () {
-    this.fireFetchData()
-  }
-
-  componentWillReceiveProps (nextProps, nextState) {
-    const oldState = this.getResolvedState()
-    const newState = this.getResolvedState(nextProps, nextState)
-
-    // Do a deep compare of new and old `defaultOption` and
-    // if they are different reset `option = defaultOption`
-    const defaultableOptions = ['sorted', 'filtered', 'resized', 'expanded']
-    defaultableOptions.forEach(x => {
-      const defaultName = `default${x.charAt(0).toUpperCase() + x.slice(1)}`
-      if (JSON.stringify(oldState[defaultName]) !== JSON.stringify(newState[defaultName])) {
-        newState[x] = newState[defaultName]
-      }
-    })
-
-    // If they change these table options, we need to reset defaults
-    // or else we could get into a state where the user has changed the UI
-    // and then disabled the ability to change it back.
-    // e.g. If `filterable` has changed, set `filtered = defaultFiltered`
-    const resettableOptions = ['sortable', 'filterable', 'resizable']
-    resettableOptions.forEach(x => {
-      if (oldState[x] !== newState[x]) {
-        const baseName = x.replace('able', '')
-        const optionName = `${baseName}ed`
-        const defaultName = `default${optionName.charAt(0).toUpperCase() + optionName.slice(1)}`
-        newState[optionName] = newState[defaultName]
-      }
-    })
-
-    // Props that trigger a data update
-    if (
-      oldState.data !== newState.data ||
-      oldState.columns !== newState.columns ||
-      oldState.pivotBy !== newState.pivotBy ||
-      oldState.sorted !== newState.sorted ||
-      oldState.filtered !== newState.filtered
-    ) {
-      this.setStateWithData(this.getDataModel(newState))
+export default Base =>
+  class extends Base {
+    componentWillMount () {
+      this.setStateWithData(this.getDataModel(this.getResolvedState()))
    }
-  }

-  setStateWithData (newState, cb) {
-    const oldState = this.getResolvedState()
-    const newResolvedState = this.getResolvedState({}, newState)
-    const {freezeWhenExpanded} = newResolvedState
+    componentDidMount () {
+      this.fireFetchData()
+    }

-    // Default to unfrozen state
-    newResolvedState.frozen = false
+    componentWillReceiveProps (nextProps, nextState) {
+      const oldState = this.getResolvedState()
+      const newState = this.getResolvedState(nextProps, nextState)

-    // 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
+      // 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 the data isn't frozen and either the data or
+      // sorting model has changed, update the data
      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)
+        (oldState.frozen && !newResolvedState.frozen) ||
+        oldState.sorted !== newResolvedState.sorted ||
+        oldState.filtered !== newResolvedState.filtered ||
+        oldState.showFilters !== newResolvedState.showFilters ||
+        (!newResolvedState.frozen &&
+          oldState.resolvedData !== newResolvedState.resolvedData)
      ) {
-        newResolvedState.expanded = {}
+        // Handle collapseOnsortedChange & collapseOnDataChange
+        if (
+          (oldState.sorted !== newResolvedState.sorted &&
+            this.props.collapseOnSortingChange) ||
+          oldState.filtered !== newResolvedState.filtered ||
+          oldState.showFilters !== newResolvedState.showFilters ||
+          (oldState.sortedData &&
+            !newResolvedState.frozen &&
+            oldState.resolvedData !== newResolvedState.resolvedData &&
+            this.props.collapseOnDataChange)
+        ) {
+          newResolvedState.expanded = {}
+        }
+
+        Object.assign(newResolvedState, this.getSortedData(newResolvedState))
      }

-      Object.assign(newResolvedState, this.getSortedData(newResolvedState))
-    }
+      // Set page to 0 if filters change
+      if (oldState.filtered !== newResolvedState.filtered) {
+        newResolvedState.page = 0
+      }

-    // Calculate pageSize all the time
-    if (newResolvedState.sortedData) {
-      newResolvedState.pages = newResolvedState.manual ? newResolvedState.pages : Math.ceil(newResolvedState.sortedData.length / newResolvedState.pageSize)
-      newResolvedState.page = Math.max(newResolvedState.page >= newResolvedState.pages ? newResolvedState.pages - 1 : newResolvedState.page, 0)
-    }
+      // 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)
+      return this.setState(newResolvedState, () => {
+        cb && cb()
+        if (
+          oldState.page !== newResolvedState.page ||
+          oldState.pageSize !== newResolvedState.pageSize ||
+          oldState.sorted !== newResolvedState.sorted ||
+          oldState.filtered !== newResolvedState.filtered
+        ) {
+          this.fireFetchData()
+        }
+      })
+    }
  }
-}
@@ -3,9 +3,10 @@ import classnames from 'classnames'
 //
 // import _ from './utils'

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

 export default class ReactTablePagination extends Component {
  constructor (props) {
@@ -16,12 +17,12 @@ export default class ReactTablePagination extends Component {
    this.applyPage = this.applyPage.bind(this)

    this.state = {
-      page: props.page
+      page: props.page,
    }
  }

  componentWillReceiveProps (nextProps) {
-    this.setState({page: nextProps.page})
+    this.setState({ page: nextProps.page })
  }

  getSafePage (page) {
@@ -33,7 +34,7 @@ export default class ReactTablePagination extends Component {

  changePage (page) {
    page = this.getSafePage(page)
-    this.setState({page})
+    this.setState({ page })
    if (this.props.page !== page) {
      this.props.onPageChange(page)
    }
@@ -60,7 +61,7 @@ export default class ReactTablePagination extends Component {
      onPageSizeChange,
      className,
      PreviousComponent = defaultButton,
-      NextComponent = defaultButton
+      NextComponent = defaultButton,
    } = this.props

    return (
@@ -70,7 +71,7 @@ export default class ReactTablePagination extends Component {
      >
        <div className='-previous'>
          <PreviousComponent
-            onClick={(e) => {
+            onClick={e => {
              if (!canPrevious) return
              this.changePage(page - 1)
            }}
@@ -81,17 +82,18 @@ export default class ReactTablePagination extends Component {
        </div>
        <div className='-center'>
          <span className='-pageInfo'>
-            {this.props.pageText} {showPageJump ? (
-              <div className='-pageJump'>
+            {this.props.pageText}{' '}
+            {showPageJump
+              ? <div className='-pageJump'>
                <input
                  type={this.state.page === '' ? 'text' : 'number'}
                  onChange={e => {
                    const val = e.target.value
                    const page = val - 1
                    if (val === '') {
-                      return this.setState({page: val})
+                      return this.setState({ page: val })
                    }
-                    this.setState({page: this.getSafePage(page)})
+                    this.setState({ page: this.getSafePage(page) })
                  }}
                  value={this.state.page === '' ? '' : this.state.page + 1}
                  onBlur={this.applyPage}
@@ -102,32 +104,31 @@ export default class ReactTablePagination extends Component {
                  }}
                />
              </div>
-            ) : (
-              <span className='-currentPage'>{page + 1}</span>
-            )} {this.props.ofText} <span className='-totalPages'>{pages || 1}</span>
+              : <span className='-currentPage'>
+                {page + 1}
+              </span>}{' '}
+            {this.props.ofText}{' '}
+            <span className='-totalPages'>{pages || 1}</span>
          </span>
-          {showPageSizeOptions && (
+          {showPageSizeOptions &&
            <span className='select-wrap -pageSizeOptions'>
              <select
-                onChange={(e) => onPageSizeChange(Number(e.target.value))}
+                onChange={e => onPageSizeChange(Number(e.target.value))}
                value={pageSize}
              >
                {pageSizeOptions.map((option, i) => {
                  return (
-                    <option
-                      key={i}
-                      value={option}>
+                    <option key={i} value={option}>
                      {option} {this.props.rowsText}
                    </option>
                  )
                })}
              </select>
-            </span>
-          )}
+            </span>}
        </div>
        <div className='-next'>
          <NextComponent
-            onClick={(e) => {
+            onClick={e => {
              if (!canNext) return
              this.changePage(page + 1)
            }}
@@ -18,7 +18,8 @@ export default {
  splitProps,
  compactObject,
  isSortingDesc,
-  normalizeComponent
+  normalizeComponent,
+  asPx,
 }

 function get (obj, path, def) {
@@ -94,12 +95,14 @@ function remove (a, b) {

 function clone (a) {
  try {
-    return JSON.parse(JSON.stringify(a, (key, value) => {
-      if (typeof value === 'function') {
-        return value.toString()
-      }
-      return value
-    }))
+    return JSON.parse(
+      JSON.stringify(a, (key, value) => {
+        if (typeof value === 'function') {
+          return value.toString()
+        }
+        return value
+      })
+    )
  } catch (e) {
    return a
  }
@@ -119,15 +122,16 @@ function sum (arr) {
  }, 0)
 }

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

 function groupBy (xs, key) {
@@ -139,6 +143,11 @@ function groupBy (xs, key) {
  }, {})
 }

+function asPx (value) {
+  value = Number(value)
+  return Number.isNaN(value) ? null : value + 'px'
+}
+
 function isArray (a) {
  return Array.isArray(a)
 }
@@ -149,10 +158,10 @@ function isArray (a) {

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

 function flattenDeep (arr, newArr = []) {
@@ -166,18 +175,22 @@ function flattenDeep (arr, newArr = []) {
  return newArr
 }

-function splitProps ({className, style, ...rest}) {
+function splitProps ({ className, style, ...rest }) {
  return {
    className,
    style,
-    rest
+    rest: rest || {},
  }
 }

 function compactObject (obj) {
  const newObj = {}
  for (var key in obj) {
-    if (obj.hasOwnProperty(key) && obj[key] !== undefined && typeof obj[key] !== 'undefined') {
+    if (
+      obj.hasOwnProperty(key) &&
+      obj[key] !== undefined &&
+      typeof obj[key] !== 'undefined'
+    ) {
      newObj[key] = obj[key]
    }
  }
@@ -189,11 +202,9 @@ function isSortingDesc (d) {
 }

 function normalizeComponent (Comp, params = {}, fallback = Comp) {
-  return typeof Comp === 'function' ? (
-    Object.getPrototypeOf(Comp).isReactComponent ? (
-      <Comp
-        {...params}
-      />
-    ) : Comp(params)
-  ) : fallback
+  return typeof Comp === 'function'
+    ? Object.getPrototypeOf(Comp).isReactComponent
+      ? <Comp {...params} />
+      : Comp(params)
+    : fallback
 }
@@ -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>
-)
Author	SHA1	Message	Date
Tanner Linsley	d8aec06496	6.5.3	2017-08-02 13:39:42 -06:00
Tanner Linsley	8efeef3b8b	Fix onClick proxying and eslint	2017-08-02 13:39:34 -06:00
Tanner Linsley	8004e7a85f	6.5.2	2017-08-02 13:25:44 -06:00
Tanner Linsley	84af88916a	Fix Typo	2017-08-02 13:16:54 -06:00
Tanner Linsley	9846bf1905	Provide onClick handleOriginal function Fixes #406	2017-08-02 13:15:16 -06:00
Tanner Linsley	bf88dda5dc	Revert to page 1 on filter change Fixes #273	2017-08-02 12:36:49 -06:00
Tanner Linsley	7f5779a833	Some simple event propagation fixes (but not the 100% fix)	2017-08-02 12:10:46 -06:00
Tanner Linsley	8792bd95a0	Move onFetchData for better timing and reliability Fixes #294	2017-08-02 08:59:54 -06:00
ldsteinandTanner Linsley	098b1fec51	Max width NaN fix (#415 ) * Added button to reset table state in Controlled Component story * Fix maxWidth style when value is NaN * code formatting	2017-08-01 21:27:40 -06:00
Tanner Linsley	750cfe3ac4	Fix Linting	2017-07-31 10:37:12 -06:00
Tanner Linsley	370f443347	Fix pivot header groups Fixes #376	2017-07-31 10:29:41 -06:00
Tanner Linsley	67f8c9adf1	Cleanup	2017-07-31 09:36:29 -06:00
Tanner Linsley	867cc25899	Fixed display of inputs and checkboxes Fixes #398	2017-07-31 09:27:03 -06:00
Caroline ShawandTanner Linsley	639630946c	Update README to reflect updates (#400 )	2017-07-25 14:01:17 -06:00
qmorelandTanner Linsley	688afd2947	[refs #321 ]: correct makePathArray function in utils (#326 )	2017-07-19 14:43:32 -06:00
Tanner LinsleyandGitHub	bbebf02a55	Update README.md	2017-07-17 15:01:04 -06:00
Tanner LinsleyandGitHub	f4d3c2d7bb	Update README.md	2017-07-17 15:00:31 -06:00
Tanner LinsleyandGitHub	f8634e771e	Update README.md	2017-07-11 14:32:10 -06:00
emyarodandTanner Linsley	ba74ab3ce8	Fix typo (#380 )	2017-07-08 10:22:24 -06:00
Tanner Linsley	30ed0c82fc	6.5.1	2017-07-05 17:09:11 -06:00
Tanner Linsley	62f19aecf0	Fix: makeTemplateComponent now supports displayName Fixes #289	2017-07-05 17:08:08 -06:00
Tanner Linsley	8dc4caff45	Fix: column.getProps().rest props are now applied correctly	2017-07-05 16:58:14 -06:00
Tanner Linsley	c2e935d75b	Fix: defaultExpanded now works correctly Fixes #372	2017-07-05 16:58:00 -06:00
Tanner Linsley	f9a1cfae1e	6.5.0	2017-07-05 10:31:56 -06:00
Tanner Linsley	5ac2c1779d	Feature: column.filterAll + docs	2017-07-05 10:31:50 -06:00
Tanner Linsley	3b2432f535	Formatting with prettier + eslint	2017-07-03 09:48:24 -06:00
Jacob CofmanandTanner Linsley	7aa98887ef	fix for issue #240 (#363 )	2017-07-03 09:14:45 -06:00
Aaron SchwartzandTanner Linsley	d26d82ecfb	Fix source code in FixedHeader example (#369 )	2017-07-03 09:13:15 -06:00
Tanner Linsley	b76f9c956d	6.4.0	2017-06-19 11:34:29 -06:00
Tanner Linsley	2e3743b75f	Feature: PadRowComponent prop	2017-06-19 11:34:21 -06:00
Tanner Linsley	fdb3e77b00	6.3.0	2017-06-09 21:02:37 -06:00
Tanner Linsley	d9248cef2b	Added defaultSortDesc prop and formatted with prettier + project's eslint	2017-06-09 21:02:28 -06:00
Tanner Linsley	f4704b146c	6.2.0	2017-06-07 21:57:54 -06:00
Tanner Linsley	004186af24	No old storybook files	2017-06-07 21:57:37 -06:00
Mayank JethvaandTanner Linsley	0d0e239baa	Top and Bottom Pagination (#283 ) * added top and bottom pagination, included story * version bump * linting * fixes * PR fixes * lint and fixes * update story * removed unused attr	2017-06-05 17:45:04 -06:00
Stanislav DzhusandTanner Linsley	f61b19cb8a	fix property name (#290 )	2017-05-30 08:45:58 -06:00
stefaniapavelandTanner Linsley	e1a46fb77e	fix IE select visual bug (#301 )	2017-05-30 08:44:32 -06:00
ldsteinandTanner Linsley	a9db5b1ac6	Add minRows to list of available props (#295 ) * Added showPaddedRows prop * Added minRows to defaultProps, added to documentation. * Revert "Added showPaddedRows prop" This reverts commit be89c4913f11df8b322ac9f65e3500c9539f838f. * Removed minRows from defaultProps	2017-05-26 22:17:41 -06:00
Tanner Linsley	846fc0d84d	6.0.5	2017-05-19 16:27:53 -06:00
Tanner Linsley	87610c83fa	Revert overflow styles	2017-05-19 16:27:48 -06:00
Tanner Linsley	a58f5c4de2	Update docs	2017-05-19 16:26:48 -06:00
Tanner Linsley	1995bba652	6.0.4	2017-05-19 12:06:48 -06:00
Tanner Linsley	680747d1d0	Fixed: scrollbar no longer offsets flex widths, documentation deps fixed	2017-05-19 12:06:35 -06:00
Tanner Linsley	e70b29066b	6.0.3	2017-05-16 11:50:41 -06:00
Tanner Linsley	9d82cee707	Better vertical responsiveness & Fixed Header example	2017-05-16 11:50:34 -06:00
Tanner Linsley	db1edf119d	6.0.2	2017-05-16 11:16:34 -06:00
theCmakerandTanner Linsley	c5fa476b6d	Fixed issue #210 - Ignore filters on hidden columns. (#265 ) * Fixed issue #210 - Ignore filters on hidden columns. * Fixed issue #210 - Ignore filters on hidden columns	2017-05-16 09:17:36 -06:00
atkawa7andTanner Linsley	550a1f7107	Fix default sorting documentation (#270 )	2017-05-16 09:09:09 -06:00
Mark HatchandTanner Linsley	42e1a12ea9	Height on pagination button removed (#275 )	2017-05-15 22:36:42 -06:00
Tanner Linsley	15945d28a1	Always keep track of internal state regardless of controlled props, but allow prop overrides	2017-05-15 21:22:58 -06:00
Tanner Linsley	eaa7215674	Update Readme	2017-05-14 02:22:28 -06:00
Tanner Linsley	d2835b9e14	Fix storybook link	2017-05-14 02:22:05 -06:00
Tanner Linsley	5691fa2e7a	Upgrade react-story	2017-05-14 02:18:44 -06:00
Tanner Linsley	f4aba6a008	Upgrade react-story	2017-05-14 01:36:07 -06:00
Tanner Linsley	7bce5a8958	Update Docs	2017-05-14 01:28:32 -06:00
Tanner Linsley	875d3d93d6	Update Contributing	2017-05-14 01:18:35 -06:00
Tanner Linsley	a0ede1593b	Pass standard code style	2017-05-14 01:15:06 -06:00
Tanner Linsley	0d43b6d601	Fix stories	2017-05-14 01:10:56 -06:00
Tanner Linsley	9dbd485cad	Migrate docs to CRA + react-story + netlify	2017-05-14 01:03:46 -06:00
				`@@ -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":""}`
				`@@ -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":""}`