v7.0.0-alpha.1

- adding isTop prop into pagination component, which allows
differentiate if pagination is on top or bottom of the table

.eslintrc.js

@@ -1,3 +1,3 @@
 module.exports = {
-  extends: 'react-tools'
+  extends: 'react-tools',
 }

.gitattributes

@@ -0,0 +1 @@
+* text=auto

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,46 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+# Using v6?
+
+v6 is now considered feature complete to its current abilities and limitations. We are not actively working to fix any issues for v6 any more. We will, however, merge any non-breaking pull requests submitted to fix anything in v6.
+
+# Using v7?
+
+Thanks for using the alpha version of React Table v7! We're very excited about it.
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Codesandbox!**
+Use a new [react-table codesandbox](https://codesandbox.io/s/m5lxzzpz69) to reproduce the issue.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,9 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+# STOP
+
+We do not track feature requests through Github. Please use the [Spectrum React Table Forum](https://spectrum.chat/react-table) to talk about new ideas and features.

.github/ISSUE_TEMPLATE/questions--support---help.md

@@ -0,0 +1,11 @@
+---
+name: Questions, Support & Help
+about: Looking for help? Need a question answered?
+
+---
+
+# STOP
+
+We do not use Github to track general support. Please use our public support forum at https://spectrum.chat/react-table.
+
+NOTE: If a support/help/question issue is opened, it will be closed immediately and be redirected to the forum. Thanks for helping us keep our issues clean and productive!

.gitignore

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

CHANGELOG.md

@@ -1,57 +1,173 @@
+## 6.8.6
+
+#### Fixes & Optimizations
+
+* Since `resolveData` is now capable of materializing data on it's own, the `data` prop is no longer required as a prop-type.
+
+## 6.8.4
+
+#### Fixes & Optimizations
+
+* Only run `resolveData` prop when `data` prop has changed, not any others.
+
+## 6.8.3
+
+#### Fixes & Optimizations
+
+* Allow the `resolveData` prop to alter or materialize new data when the `data` prop changes.
+
+## 6.8.1
+
+#### Fixes & Optimizations
+
+* Updated eslint and code formatting
+
+## 6.7.5
+
+#### Fixes & Optimizations
+
+* Now passes `column` to `getResizerProps` (#667)
+* NOTE: `getResizerProps` is now only called if the column is resizable
+* Fixes the `className` ordering in defaultProps for ThComponent (#673)
+* NOTE: user supplied classNames now come at the end so they can extend the defaults
+
+## 6.7.4
+
+#### Fixes & Optimizations
+
+* Fix Prop types for columns
+
+## 6.7.3
+
+#### Fixes & Optimizations
+
+* Fix the rest of the proptypes
+
+## 6.7.2
+
+#### Fixes & Optimizations
+
+* `getPropTypes` proptype check
+
+## 6.7.1
+
+#### Fixes & Optimizations
+
+* `eslint-config` moved to dev deps
+
+## 6.7.0
+
+## 6.7.0-alpha-0
+
+#### New Features
+
+* Expose page/pageSize to rows/cells
+* Supply sort direction to custom sort methods
+
+#### Fixes & Optimizations
+
+* README updates
+* Linter cleanup
+* Added PropTypes node module
+* Deps, linting and style upgrades
+
+## 6.6.0
+
+#### Fixes & Optimizations
+
+* moved repo to react-tools
+* Doc examples moved to codesandbox.io
+* README updates
+* CSS refacting for rt-tfoot to match rt-thead
+* CSS more specific for input and select
+
+## 6.5.3
+
+#### Fixes & Optimizations
+
+* `onClick` proxying and eslint
+
+## 6.5.2
+
+#### New Features
+
+* Provide onClick handleOriginal function - #406
+
+#### Fixes & Optimizations
+
+* README updates
+* `makePathArray` in utils - #326
+* Various fixes: #294, #376, #398, #415,
+
+## 6.5.1
+
+#### Fixes & Optimizations
+
+* `defaultExpanded` now works correctly - #372
+* `column.getProps().rest` props are now applied correctly
+* `makeTemplateComponent` now supports `displayName` - #289
+
 ## 6.5.0
+
 ##### New Features
-- `column.filterAll` - defaults to `false`, but when set to `true` will provide the entire array of rows to `filterMethod` as opposed to one row at a time. This allows for more fine-grained filtering using any method you can dream up. See the [Custom Filtering example](https://react-table.js.org/#/story/custom-filtering) for more info.
+
+* `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 ` `
+
+* `PadRowComponent` - the content rendered inside of a padding row. Defaults to a react component that renders ` `
 
 ## 6.3.0
+
 ##### New Features
-- `defaultSortDesc` - allows you to set the default sorting direction for all columns to descending.
-- `column.defaultSortDesc` - allows you to set the default sorting direction for a specific column. Falls back to the global `defaultSortDesc` when not set at all.
+
+* `defaultSortDesc` - allows you to set the default sorting direction for all columns to descending.
+* `column.defaultSortDesc` - allows you to set the default sorting direction for a specific column. Falls back to the global `defaultSortDesc` when not set at all.
 
 ## 6.0.0
 
 ##### New Features
-- New Renderers:
-  - `Aggregated` - Custom renderer for aggregated cells
-  - `Pivot` - Custom renderer for Pivoted Cells (utilizes `Expander` and `PivotValue`)
-  - `PivotValue` - Custom renderer for Pivot cell values (deprecates the undocumented `pivotRender` option)
-  - `Expander` - Custom renderer for Pivot cell Expander
-- Added custom sorting methods per table via `defaultSortMethod` and per column via `column.sortMethod`
-- Pivot columns are now visibly separate and sorted/filtered independently.
-- Added `column.resizable` to override global table `resizable` option for specific columns.
-- Added `column.sortable` to override global table `sortable` option for specific columns.
-- Added `column.filterable` to override global table `filterable` option for specific columns.
-- Added `defaultExpanded` table option.
-- All callbacks can now be utilized without needing to hoist and manage the piece of state they export. That is what their prop counterparts are for, so now the corresponding prop is used instead of the callback to detect a "fully controlled" state.
-- Prevent transitions while column resizing for a smoother resize effect.
-- Disable text selection while resizing columns.
 
+* New Renderers:
+  * `Aggregated` - Custom renderer for aggregated cells
+  * `Pivot` - Custom renderer for Pivoted Cells (utilizes `Expander` and `PivotValue`)
+  * `PivotValue` - Custom renderer for Pivot cell values (deprecates the undocumented `pivotRender` option)
+  * `Expander` - Custom renderer for Pivot cell Expander
+* Added custom sorting methods per table via `defaultSortMethod` and per column via `column.sortMethod`
+* Pivot columns are now visibly separate and sorted/filtered independently.
+* Added `column.resizable` to override global table `resizable` option for specific columns.
+* Added `column.sortable` to override global table `sortable` option for specific columns.
+* Added `column.filterable` to override global table `filterable` option for specific columns.
+* Added `defaultExpanded` table option.
+* All callbacks can now be utilized without needing to hoist and manage the piece of state they export. That is what their prop counterparts are for, so now the corresponding prop is used instead of the callback to detect a "fully controlled" state.
+* Prevent transitions while column resizing for a smoother resize effect.
+* Disable text selection while resizing columns.
 
 ##### Breaking API Changes
-- New Renderers:
-  - `Cell` - deprecates and replaces `render`
-  - `Header` - deprecates and replaces `header`
-  - `Footer` - deprecates and replaces `footer`
-  - `Filter`- deprecates and replaces `filterRender`
-- Callbacks now provide the destination state as the primary parameter(s). This makes hoisting and controlling the state in redux or component state much easier. eg.
-  - `onSorting` no longer requires you to build your own toggle logic
-  - `onResize` no longer requires you to build your own resize logic
-- Renamed `onChange` callback -> `onFetchData` which will always fire when a new data model needs to be fetched (or if not using `manual`, when new data is materialized internally).
-- Renamed `filtering` -> `filtered`
-- Renamed `sorting` -> `sorted`
-- Renamed `expandedRows` -> `expanded`
-- Renamed `resizing` -> `resized`
-- Renamed `defaultResizing` -> `defaultResized`
-- Renamed `defaultFiltering` -> `defaultFiltered`
-- Renamed `defaultSorting` -> `defaultSorted`
-- Renamed `onSortingChange` -> `onSortedChange`
-- Renamed `onFilteringChange` -> `onFilteredChange`
-- Renamed `onResize` -> `onResizedChange`
-- Renamed `onExpandRow` -> `onExpandedChange`
-- Renamed `showFilters` -> `filterable`
-- Renamed `hideFilter` -> `filterable` (Column option. Note the true/false value is now flipped.)
-- `cellInfo.row` and `rowInfo.row` now reference the materialize data for the table. To reference the original row, use `cellInfo.original` and `rowInfo.original`
-- Removed `pivotRender` column option. You can now control how the value is displayed by overriding the `PivotValueComponent` or the individual column's `PivotValue` renderer. See [Pivoting Options Story](https://react-table.js.org/?selectedKind=2.%20Demos&selectedStory=Pivoting%20Options&full=0&down=1&left=1&panelRight=0&downPanel=kadirahq%2Fstorybook-addon-actions%2Factions-panel) for a reference on how to customize pivot column rendering.
+
+* New Renderers:
+  * `Cell` - deprecates and replaces `render`
+  * `Header` - deprecates and replaces `header`
+  * `Footer` - deprecates and replaces `footer`
+  * `Filter`- deprecates and replaces `filterRender`
+* Callbacks now provide the destination state as the primary parameter(s). This makes hoisting and controlling the state in redux or component state much easier. eg.
+  * `onSorting` no longer requires you to build your own toggle logic
+  * `onResize` no longer requires you to build your own resize logic
+* Renamed `onChange` callback -> `onFetchData` which will always fire when a new data model needs to be fetched (or if not using `manual`, when new data is materialized internally).
+* Renamed `filtering` -> `filtered`
+* Renamed `sorting` -> `sorted`
+* Renamed `expandedRows` -> `expanded`
+* Renamed `resizing` -> `resized`
+* Renamed `defaultResizing` -> `defaultResized`
+* Renamed `defaultFiltering` -> `defaultFiltered`
+* Renamed `defaultSorting` -> `defaultSorted`
+* Renamed `onSortingChange` -> `onSortedChange`
+* Renamed `onFilteringChange` -> `onFilteredChange`
+* Renamed `onResize` -> `onResizedChange`
+* Renamed `onExpandRow` -> `onExpandedChange`
+* Renamed `showFilters` -> `filterable`
+* Renamed `hideFilter` -> `filterable` (Column option. Note the true/false value is now flipped.)
+* `cellInfo.row` and `rowInfo.row` now reference the materialize data for the table. To reference the original row, use `cellInfo.original` and `rowInfo.original`
+* Removed `pivotRender` column option. You can now control how the value is displayed by overriding the `PivotValueComponent` or the individual column's `PivotValue` renderer. See [Pivoting Options Story](https://react-table.js.org/?selectedKind=2.%20Demos&selectedStory=Pivoting%20Options&full=0&down=1&left=1&panelRight=0&downPanel=kadirahq%2Fstorybook-addon-actions%2Factions-panel) for a reference on how to customize pivot column rendering.

ISSUE_TEMPLATE.md

@@ -1,14 +0,0 @@
-## What version of React-Table are you using?
-Your bug may already be fixed in the latest release. Run `yarn upgrade react-table`!
-Place your version here...
-
-## What bug are you experiencing, or what feature are you proposing?
-Please include a detailed explanation here...
-
-## Use https://codesandbox.io/s/X6npLXPRW (by clicking the "Fork" button) to reproduce the issue.
-Then paste a link to your newly forked codesandbox here...
-
-## What are the steps to reproduce the issue?
-1. list the steps
-2. to reproduce
-3. the issue

docs/.eslintrc.js

@@ -1,77 +0,0 @@
-module.exports = {
-  parserOptions: {
-    ecmaVersion: 8,
-    ecmaFeatures: {
-      experimentalObjectRestSpread: true,
-      jsx: true,
-      node: false,
-      classes: true
-    },
-    sourceType: 'module'
-  },
-
-  parser: 'babel-eslint',
-
-  extends: ['standard'],
-
-  plugins: ['react'],
-
-  rules: {
-    // Nozzle
-    'jsx-quotes': [2, 'prefer-single'],
-    'comma-dangle': [2, 'always-multiline'],
-
-    // // React
-    'react/jsx-boolean-value': 2,
-    'react/jsx-curly-spacing': [2, 'never'],
-    'react/jsx-equals-spacing': [2, 'never'],
-    // 'react/jsx-indent': 2,
-    'react/jsx-indent-props': [2, 2],
-    'react/jsx-no-duplicate-props': 2,
-    'react/jsx-no-undef': 2,
-    'react/jsx-tag-spacing': [
-      2,
-      {
-        closingSlash: 'never',
-        beforeSelfClosing: 'always',
-        afterOpening: 'never'
-      }
-    ],
-    'react/jsx-uses-react': 2,
-    'react/jsx-uses-vars': 2,
-    'react/self-closing-comp': 2,
-    'react/jsx-no-bind': [
-      2,
-      {
-        allowArrowFunctions: true,
-        allowBind: false,
-        ignoreRefs: true
-      }
-    ],
-    'react/no-did-update-set-state': 2,
-    'react/no-unknown-property': 2,
-    'react/react-in-jsx-scope': 2,
-    'react/jsx-closing-bracket-location': [0, 'tag-aligned'],
-    'react/jsx-tag-spacing': [2, { beforeSelfClosing: 'always' }],
-    'react/jsx-wrap-multilines': 2,
-    'react/self-closing-comp': 2,
-    'react/jsx-key': 2,
-    'react/jsx-no-comment-textnodes': 2,
-    'react/jsx-no-duplicate-props': 2,
-    'react/jsx-no-target-blank': 2,
-    'react/jsx-no-undef': 2,
-    'react/jsx-uses-react': 2,
-    'react/jsx-uses-vars': 2,
-    'react/no-danger-with-children': 2,
-    'react/no-deprecated': 2,
-    'react/no-direct-mutation-state': 2,
-    'react/no-find-dom-node': 2,
-    'react/no-is-mounted': 2,
-    'react/no-render-return-value': 2,
-    'react/no-string-refs': 2,
-    'react/no-unknown-property': 2,
-    'react/react-in-jsx-scope': 2,
-    'react/require-render-return': 2
-    // 'react/jsx-max-props-per-line': [2, { maximum: 1 }]
-  }
-}

docs/CNAME

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

docs/package.json

@@ -1,43 +0,0 @@
-{
-  "name": "new",
-  "version": "0.1.0",
-  "private": true,
-  "devDependencies": {
-    "autoprefixer": "^6.7.0",
-    "babel-cli": "6.14.0",
-    "babel-eslint": "6.1.2",
-    "babel-preset-es2015": "6.14.0",
-    "babel-preset-react": "6.11.1",
-    "babel-preset-stage-2": "6.13.0",
-    "eslint": "^4.1.1",
-    "match-sorter": "^1.8.0",
-    "npm-run-all": "^3.1.1",
-    "onchange": "^3.0.2",
-    "postcss-cli": "^2.6.0",
-    "react": "^15.4.2",
-    "react-dom": "^15.4.2",
-    "react-json-tree": "^0.10.9",
-    "rimraf": "^2.6.1",
-    "standard": "^10.0.2",
-    "stylus": "^0.54.5"
-  },
-  "dependencies": {
-    "eslint-config-react-tools": "^1.0.10",
-    "github-markdown-css": "^2.6.0",
-    "marked": "^0.3.6",
-    "namor": "^1.0.1",
-    "raw-loader": "^0.5.1",
-    "react": "^15.5.4",
-    "react-dom": "^15.5.4",
-    "react-json-tree": "^0.10.9",
-    "react-script": "^2.0.5",
-    "react-scripts": "^0.9.5",
-    "react-story": "^0.0.10"
-  },
-  "scripts": {
-    "start": "react-scripts start",
-    "build": "react-scripts build",
-    "test": "react-scripts test --env=jsdom",
-    "eject": "react-scripts eject"
-  }
-}

docs/public/index.html

@@ -1,31 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
-    <!--
-      Notice the use of %PUBLIC_URL% in the tag above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
-
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
-    -->
-    <title>React Table - A lightweight, fast and extendable datagrid built for React</title>
-  </head>
-  <body>
-    <div id="root"></div>
-    <!--
-      This HTML file is a template.
-      If you open it directly in the browser, you will see an empty page.
-
-      You can add webfonts, meta tags, or analytics to this file.
-      The build step will place the bundled scripts into the <body> tag.
-
-      To begin the development, run `npm start`.
-      To create a production bundle, use `npm run build`.
-    -->
-  </body>
-</html>

docs/src/App.js

@@ -1,104 +0,0 @@
-import React from 'react'
-//
-import ReactStory, { defaultProps } from 'react-story'
-import CodeSandbox from './CodeSandbox.js'
-import './stories/utils/prism.css'
-import '../../react-table.css'
-
-import Readme from './stories/Readme.js'
-
-const stories = [
-  { name: 'Readme', component: Readme },
-  { name: 'Simple Table', component: CodeSandbox('X6npLXPRW') },
-  {
-    name: 'Cell Renderers & Custom Components',
-    component: CodeSandbox('OyRL04Z4Y'),
-  },
-  { name: 'Default Sorting', component: CodeSandbox('gLwmmjzA3') },
-  {
-    name: 'Custom Sorting',
-    component: CodeSandbox('VGx67J35'),
-  },
-  { name: 'Custom Column Widths', component: CodeSandbox('o2OORXNXN') },
-  { name: 'Custom Component Props', component: CodeSandbox('nZW3L0wp4') },
-  { name: 'Server-side Data', component: CodeSandbox('wjrn8wy3R') },
-  { name: 'Sub Components', component: CodeSandbox('n2gqAxl7') },
-  { name: 'Pivoting & Aggregation', component: CodeSandbox('oNY9z8xN') },
-  {
-    name: 'Pivoting & Aggregation w/ Sub Components',
-    component: CodeSandbox('p0kEVBgQ'),
-  },
-  {
-    name: '100k Rows w/ Pivoting & Sub Components',
-    component: CodeSandbox('DRmKj0XyK'),
-  },
-  { name: 'Pivoting Options', component: CodeSandbox('kZKmNBK6r') },
-  { name: 'Functional Rendering', component: CodeSandbox('VPZ0Bzv8X') },
-  {
-    name: 'Custom Expander Position',
-    component: CodeSandbox('1jj2XrPEV'),
-  },
-  { name: 'Custom "No Data" Text', component: CodeSandbox('RgRpRDv80') },
-  { name: 'Footers', component: CodeSandbox('KOqQXn3p8') },
-  { name: 'Custom Filtering', component: CodeSandbox('5Eyxxxyx') },
-  { name: 'Controlled Component', component: CodeSandbox('r7XEZRK2') },
-  { name: 'Editable Table', component: CodeSandbox('n5r19gzQP') },
-  {
-    name: 'Fixed Header w/ Vertical Scroll',
-    component: CodeSandbox('7LY0gjA8O'),
-  },
-  {
-    name: 'Multiple Pagers (Top and Bottom)',
-    component: CodeSandbox('VEZ8OgvX'),
-  },
-]
-
-export default class App extends React.Component {
-  render () {
-    return (
-      <ReactStory
-        style={{
-          display: 'block',
-          width: '100%',
-          height: '100%',
-        }}
-        pathPrefix='story/'
-        StoryWrapper={props => (
-          <defaultProps.StoryWrapper
-            css={{
-              padding: 0,
-              display: 'flex',
-              flexDirection: 'column',
-            }}
-          >
-            <a
-              href='//github.com/react-tools/react-table'
-              style={{
-                display: 'block',
-                textAlign: 'center',
-                borderBottom: 'solid 3px #cccccc',
-              }}
-            >
-              <img
-                src='https://github.com/react-tools/media/raw/master/logo-react-table.png'
-                alt='React Table Logo'
-                style={{
-                  width: '150px',
-                  padding: '10px',
-                }}
-              />
-            </a>
-            <div
-              {...props}
-              style={{
-                flex: '1 0 auto',
-                position: 'relative',
-              }}
-            />
-          </defaultProps.StoryWrapper>
-        )}
-        stories={stories}
-      />
-    )
-  }
-}

docs/src/CodeSandbox.js

@@ -1,22 +0,0 @@
-import React from 'react'
-
-export default id => () => {
-  return (
-    <iframe
-      src={`https://codesandbox.io/embed/${id}?autoresize=1&hidenavigation=1&view=${global.innerWidth <
-      1000
-        ? 'preview'
-        : 'split'}`}
-      style={{
-        position: 'absolute',
-        top: 0,
-        left: 0,
-        width: `100%`,
-        height: `100%`,
-        border: 0,
-        overflow: `hidden`,
-      }}
-      sandbox='allow-modals allow-forms allow-popups allow-scripts allow-same-origin'
-    />
-  )
-}

docs/src/index.css

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

docs/src/index.js

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

docs/src/stories/Readme.js

@@ -1,23 +0,0 @@
-/* eslint-disable import/no-webpack-loader-syntax */
-import React from 'react'
-import marked from 'marked'
-//
-import Readme from '!raw!../../../README.md'
-import 'github-markdown-css/github-markdown.css'
-import './utils/prism.js'
-
-export default class Story extends React.Component {
-  render () {
-    return (
-      <div style={{ padding: '10px' }}>
-        <span
-          className='markdown-body'
-          dangerouslySetInnerHTML={{ __html: marked(Readme) }}
-        />
-      </div>
-    )
-  }
-  componentDidMount () {
-    global.Prism && global.Prism.highlightAll()
-  }
-}

docs/src/stories/utils/prism.css

@@ -1,138 +0,0 @@
-/* http://prismjs.com/download.html?themes=prism&languages=markup+css+clike+javascript */
-/**
- * prism.js default theme for JavaScript, CSS and HTML
- * Based on dabblet (http://dabblet.com)
- * @author Lea Verou
- */
-
-code[class*="language-"],
-pre[class*="language-"] {
-	color: black;
-	background: none;
-	text-shadow: 0 1px white;
-	font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
-	text-align: left;
-	white-space: pre;
-	word-spacing: normal;
-	word-break: normal;
-	word-wrap: normal;
-	line-height: 1.5;
-
-	-moz-tab-size: 4;
-	-o-tab-size: 4;
-	tab-size: 4;
-
-	-webkit-hyphens: none;
-	-moz-hyphens: none;
-	-ms-hyphens: none;
-	hyphens: none;
-}
-
-pre[class*="language-"]::-moz-selection, pre[class*="language-"] ::-moz-selection,
-code[class*="language-"]::-moz-selection, code[class*="language-"] ::-moz-selection {
-	text-shadow: none;
-	background: #b3d4fc;
-}
-
-pre[class*="language-"]::selection, pre[class*="language-"] ::selection,
-code[class*="language-"]::selection, code[class*="language-"] ::selection {
-	text-shadow: none;
-	background: #b3d4fc;
-}
-
-@media print {
-	code[class*="language-"],
-	pre[class*="language-"] {
-		text-shadow: none;
-	}
-}
-
-/* Code blocks */
-pre[class*="language-"] {
-	padding: 1em;
-	margin: .5em 0;
-	overflow: auto;
-}
-
-:not(pre) > code[class*="language-"],
-pre[class*="language-"] {
-	background: #f5f2f0;
-}
-
-/* Inline code */
-:not(pre) > code[class*="language-"] {
-	padding: .1em;
-	border-radius: .3em;
-	white-space: normal;
-}
-
-.token.comment,
-.token.prolog,
-.token.doctype,
-.token.cdata {
-	color: slategray;
-}
-
-.token.punctuation {
-	color: #999;
-}
-
-.namespace {
-	opacity: .7;
-}
-
-.token.property,
-.token.tag,
-.token.boolean,
-.token.number,
-.token.constant,
-.token.symbol,
-.token.deleted {
-	color: #905;
-}
-
-.token.selector,
-.token.attr-name,
-.token.string,
-.token.char,
-.token.builtin,
-.token.inserted {
-	color: #690;
-}
-
-.token.operator,
-.token.entity,
-.token.url,
-.language-css .token.string,
-.style .token.string {
-	color: #a67f59;
-	background: hsla(0, 0%, 100%, .5);
-}
-
-.token.atrule,
-.token.attr-value,
-.token.keyword {
-	color: #07a;
-}
-
-.token.function {
-	color: #DD4A68;
-}
-
-.token.regex,
-.token.important,
-.token.variable {
-	color: #e90;
-}
-
-.token.important,
-.token.bold {
-	font-weight: bold;
-}
-.token.italic {
-	font-style: italic;
-}
-
-.token.entity {
-	cursor: help;
-}

package.json

@@ -1,12 +1,12 @@
 {
   "name": "react-table",
-  "version": "6.7.3",
+  "version": "7.0.0-alpha.1",
   "description": "A fast, lightweight, opinionated table and datagrid built on React",
   "license": "MIT",
-  "homepage": "https://github.com/react-tools/react-table#readme",
+  "homepage": "https://github.com/tannerlinsley/react-table#readme",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/react-tools/react-table.git"
+    "url": "git+https://github.com/tannerlinsley/react-table.git"
   },
   "keywords": [
     "react",
@@ -14,67 +14,54 @@
     "react-table",
     "datagrid"
   ],
-  "main": "lib/index.js",
+  "main": "dist/index.js",
+  "_module": "dist/index.es.js",
+  "_jsnext:main": "dist/index.es.js",
+  "scripts": {
+    "test": "cross-env CI=1 react-scripts test --env=jsdom",
+    "test:watch": "react-scripts test --env=jsdom",
+    "build": "rollup -c",
+    "start": "rollup -c -w",
+    "prepare": "yarn build",
+    "release": "yarn publish",
+    "releaseNext": "yarn publish --tag next"
+  },
   "files": [
     "src/",
+    "es/",
     "lib/",
     "react-table.js",
+    "react-table.min.js",
     "react-table.css",
     "media/*.png"
   ],
-  "scripts": {
-    "build:node": "babel src --out-dir lib --source-maps inline",
-    "build:css": "rimraf react-table.css && stylus src/index.styl --compress -o react-table.css && yarn run css:autoprefix",
-    "css:autoprefix": "postcss --use autoprefixer react-table.css -r",
-    "watch": "npm-run-all --parallel watch:*",
-    "watch:node": "onchange 'src/**/*.js' -i -- npm run build:node",
-    "watch:css": "onchange 'src/**/*.styl' -i -- npm run build:css",
-    "test": "eslint src",
-    "umd": "rimraf react-table.js && webpack --config umd.webpack.js",
-    "build": "npm-run-all build:*",
-    "prepublish": "npm run build && npm run umd",
-    "postpublish": "git push --tags",
-    "docs": "yarn watch & cd docs && yarn && yarn start",
-    "docs:build": "yarn build && cd docs && yarn && yarn build"
-  },
-  "dependencies": {
-    "classnames": "^2.2.5"
-  },
   "peerDependencies": {
-    "react": "^15.x.x || ^16.x.x",
-    "eslint-config-react-tools": "^1.0.10"
+    "prop-types": "^15.5.0",
+    "react": "^16.7.0-alpha.0 || ^16.8.x",
+    "react-dom": "^16.7.0-alpha.0 || ^16.8.x"
   },
   "devDependencies": {
-    "autoprefixer": "^6.7.0",
-    "babel-cli": "6.14.0",
-    "babel-eslint": "6.1.2",
-    "babel-preset-es2015": "6.14.0",
-    "babel-preset-react": "6.11.1",
-    "babel-preset-stage-2": "6.13.0",
-    "eslint": "^4.1.1",
-    "eslint-config-standard": "^10.2.1",
-    "eslint-plugin-import": "^2.7.0",
-    "eslint-plugin-node": "^5.2.0",
-    "eslint-plugin-react": "^7.4.0",
-    "eslint-plugin-standard": "^3.0.1",
-    "match-sorter": "^1.8.0",
-    "npm-run-all": "^3.1.1",
-    "onchange": "^3.0.2",
-    "postcss-cli": "^2.6.0",
-    "prop-types": "^15.6.0",
-    "react": "^15.4.2",
-    "react-dom": "^15.4.2",
-    "react-json-tree": "^0.10.9",
-    "rimraf": "^2.6.1",
-    "standard": "^10.0.2",
-    "stylus": "^0.54.5",
-    "webpack": "^2.5.1"
-  },
-  "babel": {
-    "presets": [
-      "es2015",
-      "stage-2",
-      "react"
-    ]
+    "@babel/plugin-proposal-class-properties": "^7.2.1",
+    "@babel/preset-env": "^7.2.0",
+    "@babel/preset-react": "^7.0.0",
+    "@babel/runtime": "^7.2.0",
+    "@svgr/rollup": "^4.1.0",
+    "babel-core": "7.0.0-bridge.0",
+    "babel-eslint": "^10.0.1",
+    "cross-env": "^5.1.4",
+    "eslint": "^5.10.0",
+    "eslint-config-standard": "^12.0.0",
+    "eslint-config-standard-react": "^7.0.2",
+    "eslint-plugin-import": "^2.13.0",
+    "eslint-plugin-node": "^8.0.0",
+    "eslint-plugin-promise": "^4.0.0",
+    "eslint-plugin-react": "^7.10.0",
+    "eslint-plugin-standard": "^4.0.0",
+    "rollup": "^0.68.0",
+    "rollup-plugin-babel": "^4.1.0",
+    "rollup-plugin-commonjs": "^9.1.3",
+    "rollup-plugin-node-resolve": "^4.0.0",
+    "rollup-plugin-peer-deps-external": "^2.2.0",
+    "rollup-plugin-uglify": "^6.0.2"
   }
 }

rollup.config.js

@@ -0,0 +1,42 @@
+import nodeResolve from 'rollup-plugin-node-resolve'
+import babel from 'rollup-plugin-babel'
+import replace from 'rollup-plugin-replace'
+import commonjs from 'rollup-plugin-commonjs'
+import uglify from 'rollup-plugin-uglify'
+
+const env = process.env.NODE_ENV
+
+const config = {
+  input: 'src/index.js',
+  output: {
+    file: env === 'production' ? 'react-table.min.js' : 'react-table.js',
+    format: 'umd',
+    globals: {
+      react: 'React',
+    },
+    name: 'ReactTable',
+    exports: 'named',
+  },
+  external: ['react'],
+  plugins: [
+    nodeResolve(),
+    babel({
+      exclude: '**/node_modules/**',
+    }),
+    replace({
+      'process.env.NODE_ENV': JSON.stringify(env),
+    }),
+    commonjs(),
+  ],
+}
+
+if (env === 'production') {
+  config.plugins.push(uglify({
+    compress: {
+      dead_code: true,
+      warnings: false,
+    },
+  }))
+}
+
+export default config

src/aggregations.js

@@ -0,0 +1,7 @@
+export function sum (values, rows) {
+  return values.reduce((sum, next) => sum + next, 0)
+}
+
+export function average (values, rows) {
+  return Math.round((sum(values, rows) / values.length) * 100) / 100
+}

src/defaultProps.js

@@ -1,247 +0,0 @@
-import React from 'react'
-import classnames from 'classnames'
-//
-import _ from './utils'
-import Pagination from './pagination'
-
-const emptyObj = () => ({})
-
-export default {
-  // General
-  data: [],
-  loading: false,
-  showPagination: true,
-  showPaginationTop: false,
-  showPaginationBottom: true,
-  showPageSizeOptions: true,
-  pageSizeOptions: [5, 10, 20, 25, 50, 100],
-  defaultPageSize: 20,
-  showPageJump: true,
-  collapseOnSortingChange: true,
-  collapseOnPageChange: true,
-  collapseOnDataChange: true,
-  freezeWhenExpanded: false,
-  sortable: true,
-  resizable: true,
-  filterable: false,
-  defaultSortDesc: false,
-  defaultSorted: [],
-  defaultFiltered: [],
-  defaultResized: [],
-  defaultExpanded: {},
-  defaultFilterMethod: (filter, row, column) => {
-    const id = filter.pivotId || filter.id
-    return row[id] !== undefined
-      ? String(row[id]).startsWith(filter.value)
-      : true
-  },
-  defaultSortMethod: (a, b, desc) => {
-    // force null and undefined to the bottom
-    a = a === null || a === undefined ? '' : a
-    b = b === null || b === undefined ? '' : b
-    // force any string values to lowercase
-    a = typeof a === 'string' ? a.toLowerCase() : a
-    b = typeof b === 'string' ? b.toLowerCase() : b
-    // Return either 1 or -1 to indicate a sort priority
-    if (a > b) {
-      return 1
-    }
-    if (a < b) {
-      return -1
-    }
-    // returning 0, undefined or any falsey value will use subsequent sorts or the index as a tiebreaker
-    return 0
-  },
-
-  // Controlled State Props
-  // page: undefined,
-  // pageSize: undefined,
-  // sorted: [],
-  // filtered: [],
-  // resized: [],
-  // expanded: {},
-
-  // Controlled State Callbacks
-  onPageChange: undefined,
-  onPageSizeChange: undefined,
-  onSortedChange: undefined,
-  onFilteredChange: undefined,
-  onResizedChange: undefined,
-  onExpandedChange: undefined,
-
-  // Pivoting
-  pivotBy: undefined,
-
-  // Key Constants
-  pivotValKey: '_pivotVal',
-  pivotIDKey: '_pivotID',
-  subRowsKey: '_subRows',
-  aggregatedKey: '_aggregated',
-  nestingLevelKey: '_nestingLevel',
-  originalKey: '_original',
-  indexKey: '_index',
-  groupedByPivotKey: '_groupedByPivot',
-
-  // Server-side Callbacks
-  onFetchData: () => null,
-
-  // Classes
-  className: '',
-  style: {},
-
-  // Component decorators
-  getProps: emptyObj,
-  getTableProps: emptyObj,
-  getTheadGroupProps: emptyObj,
-  getTheadGroupTrProps: emptyObj,
-  getTheadGroupThProps: emptyObj,
-  getTheadProps: emptyObj,
-  getTheadTrProps: emptyObj,
-  getTheadThProps: emptyObj,
-  getTheadFilterProps: emptyObj,
-  getTheadFilterTrProps: emptyObj,
-  getTheadFilterThProps: emptyObj,
-  getTbodyProps: emptyObj,
-  getTrGroupProps: emptyObj,
-  getTrProps: emptyObj,
-  getTdProps: emptyObj,
-  getTfootProps: emptyObj,
-  getTfootTrProps: emptyObj,
-  getTfootTdProps: emptyObj,
-  getPaginationProps: emptyObj,
-  getLoadingProps: emptyObj,
-  getNoDataProps: emptyObj,
-  getResizerProps: emptyObj,
-
-  // Global Column Defaults
-  column: {
-    // Renderers
-    Cell: undefined,
-    Header: undefined,
-    Footer: undefined,
-    Aggregated: undefined,
-    Pivot: undefined,
-    PivotValue: undefined,
-    Expander: undefined,
-    Filter: undefined,
-    // All Columns
-    sortable: undefined, // use table default
-    resizable: undefined, // use table default
-    filterable: undefined, // use table default
-    show: true,
-    minWidth: 100,
-    // Cells only
-    className: '',
-    style: {},
-    getProps: emptyObj,
-    // Pivot only
-    aggregate: undefined,
-    // Headers only
-    headerClassName: '',
-    headerStyle: {},
-    getHeaderProps: emptyObj,
-    // Footers only
-    footerClassName: '',
-    footerStyle: {},
-    getFooterProps: emptyObj,
-    filterMethod: undefined,
-    filterAll: false,
-    sortMethod: undefined,
-  },
-
-  // Global Expander Column Defaults
-  expanderDefaults: {
-    sortable: false,
-    resizable: false,
-    filterable: false,
-    width: 35,
-  },
-
-  pivotDefaults: {
-    // extend the defaults for pivoted columns here
-  },
-
-  // Text
-  previousText: 'Previous',
-  nextText: 'Next',
-  loadingText: 'Loading...',
-  noDataText: 'No rows found',
-  pageText: 'Page',
-  ofText: 'of',
-  rowsText: 'rows',
-
-  // Components
-  TableComponent: _.makeTemplateComponent('rt-table', 'Table'),
-  TheadComponent: _.makeTemplateComponent('rt-thead', 'Thead'),
-  TbodyComponent: _.makeTemplateComponent('rt-tbody', 'Tbody'),
-  TrGroupComponent: _.makeTemplateComponent('rt-tr-group', 'TrGroup'),
-  TrComponent: _.makeTemplateComponent('rt-tr', 'Tr'),
-  ThComponent: ({ toggleSort, className, children, ...rest }) => {
-    return (
-      <div
-        className={classnames(className, 'rt-th')}
-        onClick={e => {
-          toggleSort && toggleSort(e)
-        }}
-        {...rest}
-      >
-        {children}
-      </div>
-    )
-  },
-  TdComponent: _.makeTemplateComponent('rt-td', 'Td'),
-  TfootComponent: _.makeTemplateComponent('rt-tfoot', 'Tfoot'),
-  FilterComponent: ({ filter, onChange }) => (
-    <input
-      type='text'
-      style={{
-        width: '100%',
-      }}
-      value={filter ? filter.value : ''}
-      onChange={event => onChange(event.target.value)}
-    />
-  ),
-  ExpanderComponent: ({ isExpanded }) => (
-    <div className={classnames('rt-expander', isExpanded && '-open')}>
-      &bull;
-    </div>
-  ),
-  PivotValueComponent: ({ subRows, value }) => (
-    <span>
-      {value} {subRows && `(${subRows.length})`}
-    </span>
-  ),
-  AggregatedComponent: ({ subRows, column }) => {
-    const previewValues = subRows
-      .filter(d => typeof d[column.id] !== 'undefined')
-      .map((row, i) => (
-        <span key={i}>
-          {row[column.id]}
-          {i < subRows.length - 1 ? ', ' : ''}
-        </span>
-      ))
-    return (
-      <span>
-        {previewValues}
-      </span>
-    )
-  },
-  PivotComponent: undefined, // this is a computed default generated using
-  // the ExpanderComponent and PivotValueComponent at run-time in methods.js
-  PaginationComponent: Pagination,
-  PreviousComponent: undefined,
-  NextComponent: undefined,
-  LoadingComponent: ({ className, loading, loadingText, ...rest }) => (
-    <div
-      className={classnames('-loading', { '-active': loading }, className)}
-      {...rest}
-    >
-      <div className='-loading-inner'>
-        {loadingText}
-      </div>
-    </div>
-  ),
-  NoDataComponent: _.makeTemplateComponent('rt-noData', 'NoData'),
-  ResizerComponent: _.makeTemplateComponent('rt-resizer', 'Resizer'),
-  PadRowComponent: () => <span>&nbsp;</span>,
-}

src/hooks/useAccessedRows.js

@@ -0,0 +1,41 @@
+import { useMemo } from 'react'
+
+export default function useAccessedRows ({
+  debug, data, columns, subRowsKey,
+}) {
+  return useMemo(
+    () => {
+      if (debug) console.info('getAccessedRows')
+
+      // Access the row's data
+      const accessRow = (data, i, depth = 0) => {
+        // Keep the original reference around
+        const original = data
+
+        // Process any subRows
+        const subRows = data[subRowsKey]
+          ? data[subRowsKey].map((d, i) => accessRow(d, i, depth + 1))
+          : undefined
+
+        const row = {
+          original,
+          index: i,
+          subRows,
+          depth,
+        }
+
+        // Create the cells and values
+        row.values = {}
+        columns.forEach(column => {
+          row.values[column.id] = column.accessor ? column.accessor(data) : undefined
+        })
+
+        return row
+      }
+
+      // Use the resolved data
+      return data.map((d, i) => accessRow(d, i))
+    },
+    [data, columns]
+  )
+}

src/hooks/useColumns.js

@@ -0,0 +1,201 @@
+import { useMemo } from 'react'
+
+import { getFirstDefined, getBy } from '../utils'
+
+export default function useColumns ({
+  debug,
+  groupBy,
+  userColumns,
+  disableSorting,
+  disableGrouping,
+  disableFilters,
+}) {
+  return useMemo(
+    () => {
+      if (debug) console.info('getColumns')
+
+      // Decorate All the columns
+      const columnTree = decorateColumnTree(userColumns)
+
+      // Get the flat list of all columns
+      let columns = flattenBy(columnTree, 'columns')
+
+      columns = [
+        ...groupBy.map(g => columns.find(col => col.id === g)),
+        ...columns.filter(col => !groupBy.includes(col.id)),
+      ]
+
+      // Get headerGroups
+      const headerGroups = makeHeaderGroups(columns, findMaxDepth(columnTree))
+      const headers = flattenBy(headerGroups, 'headers')
+
+      return {
+        columns,
+        headerGroups,
+        headers,
+      }
+    },
+    [groupBy, userColumns]
+  )
+
+  // Find the depth of the columns
+  function findMaxDepth (columns, depth = 0) {
+    return columns.reduce((prev, curr) => {
+      if (curr.columns) {
+        return Math.max(prev, findMaxDepth(curr.columns, depth + 1))
+      }
+      return depth
+    }, 0)
+  }
+
+  function decorateColumn (column, parent) {
+    // First check for string accessor
+    let {
+      id, accessor, Header, canSortBy, canGroupBy, canFilter,
+    } = column
+
+    if (typeof accessor === 'string') {
+      id = id || accessor
+      const accessorString = accessor
+      accessor = row => getBy(row, accessorString)
+    }
+
+    const grouped = groupBy.includes(id)
+
+    canSortBy = accessor
+      ? getFirstDefined(canSortBy, disableSorting === true ? false : undefined, true)
+      : false
+    canGroupBy = accessor
+      ? getFirstDefined(canGroupBy, disableGrouping === true ? false : undefined, true)
+      : false
+    canFilter = accessor
+      ? getFirstDefined(canFilter, disableFilters === true ? false : undefined, true)
+      : false
+
+    if (!id && typeof Header === 'string') {
+      id = Header
+    }
+
+    if (!id) {
+      // Accessor, but no column id? This is bad.
+      console.error(column)
+      throw new Error('A column id is required!')
+    }
+
+    column = {
+      Header: '',
+      Cell: cell => cell.value,
+      show: true,
+      ...column,
+      grouped,
+      canSortBy,
+      canGroupBy,
+      canFilter,
+      id,
+      accessor,
+      parent,
+    }
+
+    column.Aggregated = column.Aggregated || column.Cell
+
+    return column
+  }
+
+  // Build the visible columns, headers and flat column list
+  function decorateColumnTree (columns, parent, depth = 0) {
+    return columns.map(column => {
+      column = decorateColumn(column, parent)
+      if (column.columns) {
+        column.columns = decorateColumnTree(column.columns, column, depth + 1)
+      }
+      return column
+    })
+  }
+
+  function flattenBy (columns, childKey) {
+    const flatColumns = []
+
+    const recurse = columns => {
+      columns.forEach(d => {
+        if (!d[childKey]) {
+          flatColumns.push(d)
+        } else {
+          recurse(d[childKey])
+        }
+      })
+    }
+
+    recurse(columns)
+
+    return flatColumns
+  }
+
+  // Build the header groups from the bottom up
+  function makeHeaderGroups (columns, maxDepth) {
+    const headerGroups = []
+
+    const removeChildColumns = column => {
+      delete column.columns
+      if (column.parent) {
+        removeChildColumns(column.parent)
+      }
+    }
+    columns.forEach(removeChildColumns)
+
+    const buildGroup = (columns, depth = 0) => {
+      const headerGroup = {
+        headers: [],
+      }
+
+      const parentColumns = []
+
+      const hasParents = columns.some(col => col.parent)
+
+      columns.forEach(column => {
+        const isFirst = !parentColumns.length
+        let latestParentColumn = [...parentColumns].reverse()[0]
+
+        // If the column has a parent, add it if necessary
+        if (column.parent) {
+          if (isFirst || latestParentColumn.originalID !== column.parent.id) {
+            parentColumns.push({
+              ...column.parent,
+              originalID: column.parent.id,
+              id: [column.parent.id, parentColumns.length].join('_'),
+            })
+          }
+        } else if (hasParents) {
+          // If other columns have parents, add a place holder if necessary
+          const placeholderColumn = decorateColumn({
+            originalID: [column.id, 'placeholder', maxDepth - depth].join('_'),
+            id: [column.id, 'placeholder', maxDepth - depth, parentColumns.length].join('_'),
+          })
+          if (isFirst || latestParentColumn.originalID !== placeholderColumn.originalID) {
+            parentColumns.push(placeholderColumn)
+          }
+        }
+
+        // Establish the new columns[] relationship on the parent
+        if (column.parent || hasParents) {
+          latestParentColumn = [...parentColumns].reverse()[0]
+          latestParentColumn.columns = latestParentColumn.columns || []
+          if (!latestParentColumn.columns.includes(column)) {
+            latestParentColumn.columns.push(column)
+          }
+        }
+
+        headerGroup.headers.push(column)
+      })
+
+      headerGroups.push(headerGroup)
+
+      if (parentColumns.length) {
+        buildGroup(parentColumns)
+      }
+    }
+
+    buildGroup(columns)
+
+    return headerGroups.reverse()
+  }
+}

src/hooks/useControlledState.js

@@ -0,0 +1,24 @@
+const mergeStateAndProps = (state, defaults, props) => {
+  Object.keys(props).forEach(key => {
+    if (typeof props[key] !== 'undefined') {
+      state[key] = props[key]
+    }
+  })
+
+  Object.keys(defaults).forEach(key => {
+    if (typeof state[key] === 'undefined') {
+      state[key] = defaults[key]
+    }
+  })
+
+  return state
+}
+
+export default function useControlledState ([userState, userSetState], defaults, props) {
+  const state = mergeStateAndProps(userState, defaults, props)
+
+  const setState = (updater, type) =>
+    userSetState(old => updater(mergeStateAndProps(old, defaults, props)), type)
+
+  return [state, setState]
+}

src/hooks/useExpandedRows.js

@@ -0,0 +1,55 @@
+import { useMemo, useEffect } from 'react'
+
+import { getBy } from '../utils'
+
+export default function useExpandedRows ({
+  debug,
+  expanded,
+  expandedKey,
+  columns,
+  rows,
+  setState,
+  actions,
+}) {
+  return useMemo(
+    () => {
+      if (debug) console.info('getExpandedRows')
+
+      const expandedRows = []
+
+      // Here we do some mutation, but it's the last stage in the
+      // immutable process so this is safe
+      const handleRow = (row, index, depth = 0, parentPath = []) => {
+        // Compute some final state for the row
+        const path = [...parentPath, index]
+
+        row.path = path
+        row.depth = depth
+
+        row.isExpanded = (row.original && row.original[expandedKey]) || getBy(expanded, path)
+
+        row.cells = columns.map(column => {
+          const cell = {
+            column,
+            row,
+            state: null,
+            value: row.values[column.id],
+          }
+
+          return cell
+        })
+
+        expandedRows.push(row)
+
+        if (row.isExpanded && row.subRows && row.subRows.length) {
+          row.subRows.forEach((row, i) => handleRow(row, i, depth + 1, path))
+        }
+      }
+
+      rows.forEach((row, i) => handleRow(row, i))
+
+      return expandedRows
+    },
+    [rows, expanded, columns]
+  )
+}

src/hooks/useFilteredRows.js

@@ -0,0 +1,67 @@
+import { useMemo } from 'react'
+
+export default function useFilteredRows ({
+  debug,
+  filters,
+  rows,
+  columns,
+  filterFn,
+  manualFilters,
+}) {
+  return useMemo(
+    () => {
+      if (manualFilters || !Object.keys(filters).length) {
+        return rows
+      }
+
+      if (debug) console.info('getFilteredRows')
+
+      // Filters top level and nested rows
+      const filterRows = rows => {
+        let filteredRows = rows
+
+        filteredRows = Object.entries(filters).reduce((filteredSoFar, [columnID, filterValue]) => {
+          // Find the filters column
+          const column = columns.find(d => d.id === columnID)
+
+          // Don't filter hidden columns or columns that have had their filters disabled
+          if (!column || column.filterable === false) {
+            return filteredSoFar
+          }
+
+          const filterMethod = column.filterMethod || filterFn
+
+          // If 'filterAll' is set to true, pass the entire dataset to the filter method
+          if (column.filterAll) {
+            return filterMethod(filteredSoFar, columnID, filterValue, column)
+          }
+          return filteredSoFar.filter(row => filterMethod(row, columnID, filterValue, column))
+        }, rows)
+
+        // Apply the filter to any subRows
+        filteredRows = filteredRows.map(row => {
+          if (!row.subRows) {
+            return row
+          }
+          return {
+            ...row,
+            subRows: filterRows(row.subRows),
+          }
+        })
+
+        // then filter any rows without subcolumns because it would be strange to show
+        filteredRows = filteredRows.filter(row => {
+          if (!row.subRows) {
+            return true
+          }
+          return row.subRows.length > 0
+        })
+
+        return filteredRows
+      }
+
+      return filterRows(rows)
+    },
+    [rows, filters, manualFilters]
+  )
+}

src/hooks/useGroupedRows.js

@@ -0,0 +1,77 @@
+import { useMemo } from 'react'
+
+import * as aggregations from '../aggregations'
+
+export default function useGroupedRows ({
+  debug,
+  groupBy,
+  rows,
+  columns,
+  groupByFn,
+  manualGroupBy,
+  userAggregations,
+}) {
+  return useMemo(
+    () => {
+      if (manualGroupBy || !groupBy.length) {
+        return rows
+      }
+      if (debug) console.info('getGroupedRows')
+      // Find the columns that can or are aggregating
+
+      // Uses each column to aggregate rows into a single value
+      const aggregateRowsToValues = rows => {
+        const values = {}
+        columns.forEach(column => {
+          const columnValues = rows.map(d => d.values[column.id])
+          const aggregate =
+            userAggregations[column.aggregate] || aggregations[column.aggregate] || column.aggregate
+          if (typeof aggregate === 'function') {
+            values[column.id] = aggregate(columnValues, rows)
+          } else if (aggregate) {
+            throw new Error(
+              `Invalid aggregate "${aggregate}" passed to column with ID: "${column.id}"`
+            )
+          } else {
+            values[column.id] = columnValues[0]
+          }
+        })
+        return values
+      }
+
+      // Recursively group the data
+      const groupRecursively = (rows, groupBy, depth = 0) => {
+        // This is the last level, just return the rows
+        if (depth >= groupBy.length) {
+          return rows
+        }
+
+        // Group the rows together for this level
+        const groupedRows = Object.entries(groupByFn(rows, groupBy[depth])).map(
+          ([groupByVal, subRows], index) => {
+            // Recurse to sub rows before aggregation
+            subRows = groupRecursively(subRows, groupBy, depth + 1)
+
+            const values = aggregateRowsToValues(subRows)
+
+            const row = {
+              groupByID: groupBy[depth],
+              groupByVal,
+              values,
+              subRows,
+              depth,
+              index,
+            }
+            return row
+          }
+        )
+
+        return groupedRows
+      }
+
+      // Assign the new data
+      return groupRecursively(rows, groupBy)
+    },
+    [rows, groupBy, columns, manualGroupBy]
+  )
+}

src/hooks/useSortedRows.js

@@ -0,0 +1,60 @@
+import { useMemo } from 'react'
+
+export default function useSortedRows ({
+  debug,
+  sortBy,
+  rows,
+  columns,
+  orderByFn,
+  sortByFn,
+  manualSorting,
+}) {
+  return useMemo(
+    () => {
+      if (manualSorting || !sortBy.length) {
+        return rows
+      }
+      if (debug) console.info('getSortedRows')
+
+      const sortMethodsByColumnID = {}
+
+      columns
+        .filter(col => col.sortMethod)
+        .forEach(col => {
+          sortMethodsByColumnID[col.id] = col.sortMethod
+        })
+
+      const sortData = rows => {
+        // Use the orderByFn to compose multiple sortBy's together.
+        // This will also perform a stable sorting using the row index
+        // if needed.
+        const sortedData = orderByFn(
+          rows,
+          sortBy.map(sort => {
+            // Support custom sorting methods for each column
+            const columnSortBy = sortMethodsByColumnID[sort.id]
+
+            // Return the correct sortFn
+            return (a, b) =>
+              (columnSortBy || sortByFn)(a.values[sort.id], b.values[sort.id], sort.desc)
+          }),
+          // Map the directions
+          sortBy.map(d => !d.desc)
+        )
+
+        // TODO: this should be optimized. Not good to loop again
+        sortedData.forEach(row => {
+          if (!row.subRows) {
+            return
+          }
+          row.subRows = sortData(row.subRows)
+        })
+
+        return sortedData
+      }
+
+      return sortData(rows)
+    },
+    [rows, columns, sortBy, manualSorting]
+  )
+}

src/hooks/useTableMethods.js

@@ -0,0 +1,156 @@
+import { getBy, setBy, getFirstDefined } from '../utils'
+
+export default function useTableMethods ({
+  debug,
+  setState,
+  actions,
+  groupBy,
+  columns,
+  defaultSortDesc,
+  filters,
+}) {
+  const toggleExpandedByPath = (path, set) =>
+    setState(old => {
+      const { expanded } = old
+      const existing = getBy(expanded, path)
+      set = getFirstDefined(set, !existing)
+      return {
+        ...old,
+        expanded: setBy(expanded, path, set),
+      }
+    }, actions.toggleExpanded)
+
+  // Updates sorting based on a columnID, desc flag and multi flag
+  const toggleSortByID = (columnID, desc, multi) =>
+    setState(old => {
+      const { sortBy } = old
+
+      // Find the column for this columnID
+      const column = columns.find(d => d.id === columnID)
+      const resolvedDefaultSortDesc = getFirstDefined(column.defaultSortDesc, defaultSortDesc)
+
+      // Find any existing sortBy for this column
+      const existingSortBy = sortBy.find(d => d.id === columnID)
+      const hasDescDefined = typeof desc !== 'undefined' && desc !== null
+
+      let newSortBy = []
+
+      // What should we do with this filter?
+      let action
+
+      if (!multi) {
+        if (sortBy.length <= 1 && existingSortBy) {
+          if (existingSortBy.desc) {
+            action = 'remove'
+          } else {
+            action = 'toggle'
+          }
+        } else {
+          action = 'replace'
+        }
+      } else if (!existingSortBy) {
+        action = 'add'
+      } else if (hasDescDefined) {
+        action = 'set'
+      } else {
+        action = 'toggle'
+      }
+
+      if (action === 'replace') {
+        newSortBy = [
+          {
+            id: columnID,
+            desc: hasDescDefined ? desc : resolvedDefaultSortDesc,
+          },
+        ]
+      } else if (action === 'add') {
+        newSortBy = [
+          ...sortBy,
+          {
+            id: columnID,
+            desc: hasDescDefined ? desc : resolvedDefaultSortDesc,
+          },
+        ]
+      } else if (action === 'set') {
+        newSortBy = sortBy.map(d => {
+          if (d.id === columnID) {
+            return {
+              ...d,
+              desc,
+            }
+          }
+          return d
+        })
+      } else if (action === 'toggle') {
+        newSortBy = sortBy.map(d => {
+          if (d.id === columnID) {
+            return {
+              ...d,
+              desc: !existingSortBy.desc,
+            }
+          }
+          return d
+        })
+      } else if (action === 'remove') {
+        newSortBy = []
+      }
+
+      return {
+        ...old,
+        sortBy: newSortBy,
+      }
+    }, actions.sortByChange)
+
+  const toggleGroupBy = (id, toggle) =>
+    setState(old => {
+      const resolvedToggle = typeof set !== 'undefined' ? toggle : !groupBy.includes(id)
+      if (resolvedToggle) {
+        return {
+          ...old,
+          groupBy: [...groupBy, id],
+        }
+      }
+      return {
+        ...old,
+        groupBy: groupBy.filter(d => d !== id),
+      }
+    }, actions.toggleGroupBy)
+
+  const setFilter = (id, val) =>
+    setState(old => {
+      if (typeof val === 'undefined') {
+        const { [id]: prev, ...rest } = filters
+        return {
+          ...old,
+          filters: {
+            ...rest,
+          },
+        }
+      }
+
+      return {
+        ...old,
+        filters: {
+          ...filters,
+          [id]: val,
+        },
+      }
+    }, actions.setFilter)
+
+  const setAllFilters = filters =>
+    setState(
+      old => ({
+        ...old,
+        filters,
+      }),
+      actions.setAllFilters
+    )
+
+  return {
+    toggleExpandedByPath,
+    toggleSortByID,
+    toggleGroupBy,
+    setFilter,
+    setAllFilters,
+  }
+}

src/index.styl

@@ -1,318 +0,0 @@
-$easeOutQuad = cubic-bezier(0.250, 0.460, 0.450, 0.940)
-$easeOutBack = cubic-bezier(0.175,  0.885, 0.320, 1.275)
-$expandSize = 7px
-
-input-select-style()
-  border: 1px solid rgba(0,0,0,0.1)
-  background: white
-  padding: 5px 7px
-  font-size: inherit
-  border-radius: 3px
-  font-weight: normal
-  outline:none
-
-.ReactTable
-  position:relative
-  display: flex
-  flex-direction: column
-  border: 1px solid alpha(black, .1)
-  *
-    box-sizing: border-box
-  .rt-table
-    flex: auto 1
-    display: flex
-    flex-direction: column
-    align-items: stretch
-    width: 100%
-    border-collapse: collapse
-    overflow: auto
-
-  .rt-thead
-    flex: 1 0 auto
-    display: flex
-    flex-direction: column
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-
-    &.-headerGroups
-      background: alpha(black, .03)
-      border-bottom: 1px solid alpha(black, .05)
-
-    &.-filters
-      border-bottom: 1px solid alpha(black, 0.05)
-
-      input
-      select
-        input-select-style();
-
-      .rt-th
-        border-right: 1px solid alpha(black, 0.02)
-
-    &.-header
-      box-shadow: 0 2px 15px 0px alpha(black, .15)
-
-    .rt-tr
-      text-align:center
-
-    .rt-th
-    .rt-td
-      padding: 5px 5px
-      line-height: normal
-      position: relative
-      border-right: 1px solid alpha(black, .05)
-      transition box-shadow .3s $easeOutBack
-      box-shadow:inset 0 0 0 0 transparent
-      &.-sort-asc
-        box-shadow:inset 0 3px 0 0 alpha(black, .6)
-      &.-sort-desc
-        box-shadow:inset 0 -3px 0 0 alpha(black, .6)
-      &.-cursor-pointer
-        cursor: pointer
-      &:last-child
-        border-right: 0
-
-    .rt-resizable-header
-      overflow: visible
-      &:last-child
-        overflow: hidden
-
-    .rt-resizable-header-content
-      overflow: hidden
-      text-overflow: ellipsis
-
-    .rt-header-pivot
-      border-right-color: #f7f7f7
-
-    .rt-header-pivot:after, .rt-header-pivot:before
-      left: 100%
-      top: 50%
-      border: solid transparent
-      content: " "
-      height: 0
-      width: 0
-      position: absolute
-      pointer-events: none
-
-    .rt-header-pivot:after
-      border-color: rgba(255, 255, 255, 0)
-      border-left-color: #FFF
-      border-width: 8px
-      margin-top: -8px
-
-    .rt-header-pivot:before
-      border-color: rgba(102, 102, 102, 0)
-      border-left-color: #f7f7f7
-      border-width: 10px
-      margin-top: -10px
-
-  .rt-tbody
-    flex: 99999 1 auto
-    display: flex
-    flex-direction: column
-    overflow: auto
-    // z-index:0
-    .rt-tr-group
-      border-bottom: solid 1px alpha(black, .05)
-      &:last-child
-        border-bottom: 0
-    .rt-td
-      border-right:1px solid alpha(black, .02)
-      &:last-child
-        border-right:0
-    .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
-    flex: 1 0 0px
-    white-space: nowrap
-    text-overflow: ellipsis
-    padding: 7px 5px
-    overflow: hidden
-    transition: .3s ease
-    transition-property: width, min-width, padding, opacity
-
-    &.-hidden
-      width: 0 !important
-      min-width: 0 !important
-      padding: 0 !important
-      border:0 !important
-      opacity: 0 !important
-
-  .rt-expander
-    display: inline-block
-    position:relative
-    margin: 0
-    color: transparent
-    margin: 0 10px
-    &:after
-      content: ''
-      position: absolute
-      width: 0
-      height: 0
-      top:50%
-      left:50%
-      transform: translate(-50%, -50%) rotate(-90deg)
-      border-left: ($expandSize * .72) solid transparent
-      border-right: ($expandSize * .72) solid transparent
-      border-top: $expandSize solid alpha(black, .8)
-      transition: all .3s $easeOutBack
-      cursor: pointer
-    &.-open:after
-        transform: translate(-50%, -50%) rotate(0deg)
-
-  .rt-resizer
-    display: inline-block
-    position: absolute
-    width: 36px
-    top: 0
-    bottom: 0
-    right: -18px
-    cursor: col-resize
-    z-index: 10
-
-  .rt-tfoot
-    flex: 1 0 auto
-    display: flex
-    flex-direction: column
-    box-shadow: 0 0px 15px 0px alpha(black, .15)
-
-    .rt-td
-      border-right:1px solid alpha(black, .05)
-      &:last-child
-        border-right:0
-
-  &.-striped
-    .rt-tr.-odd
-      background: alpha(black, .03)
-  &.-highlight
-    .rt-tbody
-      .rt-tr:not(.-padRow):hover
-        background: alpha(black, .05)
-
-  .-pagination
-    z-index: 1
-    display:flex
-    justify-content: space-between
-    align-items: stretch
-    flex-wrap: wrap
-    padding: 3px
-    box-shadow: 0 0px 15px 0px alpha(black, .1)
-    border-top: 2px solid alpha(black, .1)
-
-    input
-    select
-      input-select-style()
-
-    .-btn
-      appearance:none
-      display:block
-      width:100%
-      height:100%
-      border: 0
-      border-radius: 3px
-      padding: 6px
-      font-size: 1em
-      color: alpha(black, .6)
-      background: alpha(black, .1)
-      transition: all .1s ease
-      cursor: pointer
-      outline:none
-
-      &[disabled]
-        opacity: .5
-        cursor: default
-
-      &:not([disabled]):hover
-        background: alpha(black, .3)
-        color: white
-
-    .-previous
-    .-next
-      flex: 1
-      text-align: center
-
-    .-center
-      flex: 1.5
-      text-align:center
-      margin-bottom:0
-      display: flex
-      flex-direction: row
-      flex-wrap: wrap
-      align-items: center
-      justify-content: space-around
-
-    .-pageInfo
-      display: inline-block
-      margin: 3px 10px
-      white-space: nowrap
-
-    .-pageJump
-      display:inline-block
-      input
-        width: 70px
-        text-align:center
-
-    .-pageSizeOptions
-      margin: 3px 10px
-
-  .rt-noData
-    display:block
-    position:absolute
-    left:50%
-    top:50%
-    transform: translate(-50%, -50%)
-    background: alpha(white, .8)
-    transition: all .3s ease
-    z-index: 1
-    pointer-events: none
-    padding: 20px
-    color: alpha(black, .5)
-
-  .-loading
-    display:block
-    position:absolute
-    left:0
-    right:0
-    top:0
-    bottom:0
-    background: alpha(white, .8)
-    transition: all .3s ease
-    z-index: -1
-    opacity: 0
-    pointer-events: none
-
-    > div
-      position:absolute
-      display: block
-      text-align:center
-      width:100%
-      top:50%
-      left: 0
-      font-size: 15px
-      color: alpha(black, .6)
-      transform: translateY(-52%)
-      transition: all .3s $easeOutQuad
-
-    &.-active
-      opacity: 1
-      z-index: 2
-      pointer-events: all
-      > div
-        transform: translateY(50%)
-
-  .rt-resizing
-    .rt-th
-    .rt-td
-      transition: none!important
-      cursor: col-resize
-      user-select none

src/lifecycle.js

@@ -1,134 +0,0 @@
-export default Base =>
-  class extends Base {
-    componentWillMount () {
-      this.setStateWithData(this.getDataModel(this.getResolvedState()))
-    }
-
-    componentDidMount () {
-      this.fireFetchData()
-    }
-
-    componentWillReceiveProps (nextProps, nextState) {
-      const oldState = this.getResolvedState()
-      const newState = this.getResolvedState(nextProps, nextState)
-
-      // Do a deep compare of new and old `defaultOption` and
-      // if they are different reset `option = defaultOption`
-      const defaultableOptions = ['sorted', 'filtered', 'resized', 'expanded']
-      defaultableOptions.forEach(x => {
-        const defaultName = `default${x.charAt(0).toUpperCase() + x.slice(1)}`
-        if (
-          JSON.stringify(oldState[defaultName]) !==
-          JSON.stringify(newState[defaultName])
-        ) {
-          newState[x] = newState[defaultName]
-        }
-      })
-
-      // If they change these table options, we need to reset defaults
-      // or else we could get into a state where the user has changed the UI
-      // and then disabled the ability to change it back.
-      // e.g. If `filterable` has changed, set `filtered = defaultFiltered`
-      const resettableOptions = ['sortable', 'filterable', 'resizable']
-      resettableOptions.forEach(x => {
-        if (oldState[x] !== newState[x]) {
-          const baseName = x.replace('able', '')
-          const optionName = `${baseName}ed`
-          const defaultName = `default${optionName.charAt(0).toUpperCase() +
-            optionName.slice(1)}`
-          newState[optionName] = newState[defaultName]
-        }
-      })
-
-      // Props that trigger a data update
-      if (
-        oldState.data !== newState.data ||
-        oldState.columns !== newState.columns ||
-        oldState.pivotBy !== newState.pivotBy ||
-        oldState.sorted !== newState.sorted ||
-        oldState.filtered !== newState.filtered
-      ) {
-        this.setStateWithData(this.getDataModel(newState))
-      }
-    }
-
-    setStateWithData (newState, cb) {
-      const oldState = this.getResolvedState()
-      const newResolvedState = this.getResolvedState({}, newState)
-      const { freezeWhenExpanded } = newResolvedState
-
-      // Default to unfrozen state
-      newResolvedState.frozen = false
-
-      // If freezeWhenExpanded is set, check for frozen conditions
-      if (freezeWhenExpanded) {
-        // if any rows are expanded, freeze the existing data and sorting
-        const keys = Object.keys(newResolvedState.expanded)
-        for (var i = 0; i < keys.length; i++) {
-          if (newResolvedState.expanded[keys[i]]) {
-            newResolvedState.frozen = true
-            break
-          }
-        }
-      }
-
-      // If the data isn't frozen and either the data or
-      // sorting model has changed, update the data
-      if (
-        (oldState.frozen && !newResolvedState.frozen) ||
-        oldState.sorted !== newResolvedState.sorted ||
-        oldState.filtered !== newResolvedState.filtered ||
-        oldState.showFilters !== newResolvedState.showFilters ||
-        (!newResolvedState.frozen &&
-          oldState.resolvedData !== newResolvedState.resolvedData)
-      ) {
-        // Handle collapseOnsortedChange & collapseOnDataChange
-        if (
-          (oldState.sorted !== newResolvedState.sorted &&
-            this.props.collapseOnSortingChange) ||
-          oldState.filtered !== newResolvedState.filtered ||
-          oldState.showFilters !== newResolvedState.showFilters ||
-          (oldState.sortedData &&
-            !newResolvedState.frozen &&
-            oldState.resolvedData !== newResolvedState.resolvedData &&
-            this.props.collapseOnDataChange)
-        ) {
-          newResolvedState.expanded = {}
-        }
-
-        Object.assign(newResolvedState, this.getSortedData(newResolvedState))
-      }
-
-      // Set page to 0 if filters change
-      if (oldState.filtered !== newResolvedState.filtered) {
-        newResolvedState.page = 0
-      }
-
-      // Calculate pageSize all the time
-      if (newResolvedState.sortedData) {
-        newResolvedState.pages = newResolvedState.manual
-          ? newResolvedState.pages
-          : Math.ceil(
-            newResolvedState.sortedData.length / newResolvedState.pageSize
-          )
-        newResolvedState.page = Math.max(
-          newResolvedState.page >= newResolvedState.pages
-            ? newResolvedState.pages - 1
-            : newResolvedState.page,
-          0
-        )
-      }
-
-      return this.setState(newResolvedState, () => {
-        cb && cb()
-        if (
-          oldState.page !== newResolvedState.page ||
-          oldState.pageSize !== newResolvedState.pageSize ||
-          oldState.sorted !== newResolvedState.sorted ||
-          oldState.filtered !== newResolvedState.filtered
-        ) {
-          this.fireFetchData()
-        }
-      })
-    }
-  }

src/methods.js

@@ -1,717 +0,0 @@
-import React from 'react'
-import _ from './utils'
-
-export default Base =>
-  class extends Base {
-    getResolvedState (props, state) {
-      const resolvedState = {
-        ..._.compactObject(this.state),
-        ..._.compactObject(this.props),
-        ..._.compactObject(state),
-        ..._.compactObject(props),
-      }
-      return resolvedState
-    }
-
-    getDataModel (newState) {
-      const {
-        columns,
-        pivotBy = [],
-        data,
-        pivotIDKey,
-        pivotValKey,
-        subRowsKey,
-        aggregatedKey,
-        nestingLevelKey,
-        originalKey,
-        indexKey,
-        groupedByPivotKey,
-        SubComponent,
-      } = newState
-
-      // Determine Header Groups
-      let hasHeaderGroups = false
-      columns.forEach(column => {
-        if (column.columns) {
-          hasHeaderGroups = true
-        }
-      })
-
-      let columnsWithExpander = [...columns]
-
-      let expanderColumn = columns.find(
-        col =>
-          col.expander ||
-          (col.columns && col.columns.some(col2 => col2.expander))
-      )
-      // The actual expander might be in the columns field of a group column
-      if (expanderColumn && !expanderColumn.expander) {
-        expanderColumn = expanderColumn.columns.find(col => col.expander)
-      }
-
-      // If we have SubComponent's we need to make sure we have an expander column
-      if (SubComponent && !expanderColumn) {
-        expanderColumn = { expander: true }
-        columnsWithExpander = [expanderColumn, ...columnsWithExpander]
-      }
-
-      const makeDecoratedColumn = (column, parentColumn) => {
-        let dcol
-        if (column.expander) {
-          dcol = {
-            ...this.props.column,
-            ...this.props.expanderDefaults,
-            ...column,
-          }
-        } else {
-          dcol = {
-            ...this.props.column,
-            ...column,
-          }
-        }
-
-        // Ensure minWidth is not greater than maxWidth if set
-        if (dcol.maxWidth < dcol.minWidth) {
-          dcol.minWidth = dcol.maxWidth
-        }
-
-        if (parentColumn) {
-          dcol.parentColumn = parentColumn
-        }
-
-        // First check for string accessor
-        if (typeof dcol.accessor === 'string') {
-          dcol.id = dcol.id || dcol.accessor
-          const accessorString = dcol.accessor
-          dcol.accessor = row => _.get(row, accessorString)
-          return dcol
-        }
-
-        // Fall back to functional accessor (but require an ID)
-        if (dcol.accessor && !dcol.id) {
-          console.warn(dcol)
-          throw new Error(
-            'A column id is required if using a non-string accessor for column above.'
-          )
-        }
-
-        // Fall back to an undefined accessor
-        if (!dcol.accessor) {
-          dcol.accessor = d => undefined
-        }
-
-        return dcol
-      }
-
-      // Decorate the columns
-      const decorateAndAddToAll = (column, parentColumn) => {
-        const decoratedColumn = makeDecoratedColumn(column, parentColumn)
-        allDecoratedColumns.push(decoratedColumn)
-        return decoratedColumn
-      }
-      const allDecoratedColumns = []
-      const decoratedColumns = columnsWithExpander.map((column, i) => {
-        if (column.columns) {
-          return {
-            ...column,
-            columns: column.columns.map(d => decorateAndAddToAll(d, column)),
-          }
-        } else {
-          return decorateAndAddToAll(column)
-        }
-      })
-
-      // Build the visible columns, headers and flat column list
-      let visibleColumns = decoratedColumns.slice()
-      let allVisibleColumns = []
-
-      visibleColumns = visibleColumns.map((column, i) => {
-        if (column.columns) {
-          const visibleSubColumns = column.columns.filter(
-            d =>
-              pivotBy.indexOf(d.id) > -1
-                ? false
-                : _.getFirstDefined(d.show, true)
-          )
-          return {
-            ...column,
-            columns: visibleSubColumns,
-          }
-        }
-        return column
-      })
-
-      visibleColumns = visibleColumns.filter(column => {
-        return column.columns
-          ? column.columns.length
-          : pivotBy.indexOf(column.id) > -1
-            ? false
-            : _.getFirstDefined(column.show, true)
-      })
-
-      // Find any custom pivot location
-      const pivotIndex = visibleColumns.findIndex(col => col.pivot)
-
-      // Handle Pivot Columns
-      if (pivotBy.length) {
-        // Retrieve the pivot columns in the correct pivot order
-        const pivotColumns = []
-        pivotBy.forEach(pivotID => {
-          const found = allDecoratedColumns.find(d => d.id === pivotID)
-          if (found) {
-            pivotColumns.push(found)
-          }
-        })
-
-        let PivotParentColumn = pivotColumns.reduce(
-          (prev, current) =>
-            prev && prev === current.parentColumn && current.parentColumn,
-          pivotColumns[0].parentColumn
-        )
-
-        let PivotGroupHeader = hasHeaderGroups && PivotParentColumn.Header
-        PivotGroupHeader = PivotGroupHeader || (() => <strong>Pivoted</strong>)
-
-        let pivotColumnGroup = {
-          Header: PivotGroupHeader,
-          columns: pivotColumns.map(col => ({
-            ...this.props.pivotDefaults,
-            ...col,
-            pivoted: true,
-          })),
-        }
-
-        // Place the pivotColumns back into the visibleColumns
-        if (pivotIndex >= 0) {
-          pivotColumnGroup = {
-            ...visibleColumns[pivotIndex],
-            ...pivotColumnGroup,
-          }
-          visibleColumns.splice(pivotIndex, 1, pivotColumnGroup)
-        } else {
-          visibleColumns.unshift(pivotColumnGroup)
-        }
-      }
-
-      // Build Header Groups
-      const headerGroups = []
-      let currentSpan = []
-
-      // A convenience function to add a header and reset the currentSpan
-      const addHeader = (columns, column) => {
-        headerGroups.push({
-          ...this.props.column,
-          ...column,
-          columns: columns,
-        })
-        currentSpan = []
-      }
-
-      // Build flast list of allVisibleColumns and HeaderGroups
-      visibleColumns.forEach((column, i) => {
-        if (column.columns) {
-          allVisibleColumns = allVisibleColumns.concat(column.columns)
-          if (currentSpan.length > 0) {
-            addHeader(currentSpan)
-          }
-          addHeader(column.columns, column)
-          return
-        }
-        allVisibleColumns.push(column)
-        currentSpan.push(column)
-      })
-      if (hasHeaderGroups && currentSpan.length > 0) {
-        addHeader(currentSpan)
-      }
-
-      // Access the data
-      const accessRow = (d, i, level = 0) => {
-        const row = {
-          [originalKey]: d,
-          [indexKey]: i,
-          [subRowsKey]: d[subRowsKey],
-          [nestingLevelKey]: level,
-        }
-        allDecoratedColumns.forEach(column => {
-          if (column.expander) return
-          row[column.id] = column.accessor(d)
-        })
-        if (row[subRowsKey]) {
-          row[subRowsKey] = row[subRowsKey].map((d, i) =>
-            accessRow(d, i, level + 1)
-          )
-        }
-        return row
-      }
-      let resolvedData = data.map((d, i) => accessRow(d, i))
-
-      // If pivoting, recursively group the data
-      const aggregate = rows => {
-        const aggregationValues = {}
-        aggregatingColumns.forEach(column => {
-          const values = rows.map(d => d[column.id])
-          aggregationValues[column.id] = column.aggregate(values, rows)
-        })
-        return aggregationValues
-      }
-
-      // TODO: Make it possible to fabricate nested rows without pivoting
-      const aggregatingColumns = allVisibleColumns.filter(
-        d => !d.expander && d.aggregate
-      )
-      if (pivotBy.length) {
-        const groupRecursively = (rows, keys, i = 0) => {
-          // This is the last level, just return the rows
-          if (i === keys.length) {
-            return rows
-          }
-          // Group the rows together for this level
-          let groupedRows = Object.entries(
-            _.groupBy(rows, keys[i])
-          ).map(([key, value]) => {
-            return {
-              [pivotIDKey]: keys[i],
-              [pivotValKey]: key,
-              [keys[i]]: key,
-              [subRowsKey]: value,
-              [nestingLevelKey]: i,
-              [groupedByPivotKey]: true,
-            }
-          })
-          // Recurse into the subRows
-          groupedRows = groupedRows.map(rowGroup => {
-            let subRows = groupRecursively(rowGroup[subRowsKey], keys, i + 1)
-            return {
-              ...rowGroup,
-              [subRowsKey]: subRows,
-              [aggregatedKey]: true,
-              ...aggregate(subRows),
-            }
-          })
-          return groupedRows
-        }
-        resolvedData = groupRecursively(resolvedData, pivotBy)
-      }
-
-      return {
-        ...newState,
-        resolvedData,
-        allVisibleColumns,
-        headerGroups,
-        allDecoratedColumns,
-        hasHeaderGroups,
-      }
-    }
-
-    getSortedData (resolvedState) {
-      const {
-        manual,
-        sorted,
-        filtered,
-        defaultFilterMethod,
-        resolvedData,
-        allVisibleColumns,
-        allDecoratedColumns,
-      } = resolvedState
-
-      const sortMethodsByColumnID = {}
-
-      allDecoratedColumns.filter(col => col.sortMethod).forEach(col => {
-        sortMethodsByColumnID[col.id] = col.sortMethod
-      })
-
-      // Resolve the data from either manual data or sorted data
-      return {
-        sortedData: manual
-          ? resolvedData
-          : this.sortData(
-            this.filterData(
-              resolvedData,
-              filtered,
-              defaultFilterMethod,
-              allVisibleColumns
-            ),
-            sorted,
-            sortMethodsByColumnID
-          ),
-      }
-    }
-
-    fireFetchData () {
-      this.props.onFetchData(this.getResolvedState(), this)
-    }
-
-    getPropOrState (key) {
-      return _.getFirstDefined(this.props[key], this.state[key])
-    }
-
-    getStateOrProp (key) {
-      return _.getFirstDefined(this.state[key], this.props[key])
-    }
-
-    filterData (data, filtered, defaultFilterMethod, allVisibleColumns) {
-      let filteredData = data
-
-      if (filtered.length) {
-        filteredData = filtered.reduce((filteredSoFar, nextFilter) => {
-          const column = allVisibleColumns.find(x => x.id === nextFilter.id)
-
-          // Don't filter hidden columns or columns that have had their filters disabled
-          if (!column || column.filterable === false) {
-            return filteredSoFar
-          }
-
-          const filterMethod = column.filterMethod || defaultFilterMethod
-
-          // If 'filterAll' is set to true, pass the entire dataset to the filter method
-          if (column.filterAll) {
-            return filterMethod(nextFilter, filteredSoFar, column)
-          } else {
-            return filteredSoFar.filter(row => {
-              return filterMethod(nextFilter, row, column)
-            })
-          }
-        }, filteredData)
-
-        // Apply the filter to the subrows if we are pivoting, and then
-        // filter any rows without subcolumns because it would be strange to show
-        filteredData = filteredData
-          .map(row => {
-            if (!row[this.props.subRowsKey]) {
-              return row
-            }
-            return {
-              ...row,
-              [this.props.subRowsKey]: this.filterData(
-                row[this.props.subRowsKey],
-                filtered,
-                defaultFilterMethod,
-                allVisibleColumns
-              ),
-            }
-          })
-          .filter(row => {
-            if (!row[this.props.subRowsKey]) {
-              return true
-            }
-            return row[this.props.subRowsKey].length > 0
-          })
-      }
-
-      return filteredData
-    }
-
-    sortData (data, sorted, sortMethodsByColumnID = {}) {
-      if (!sorted.length) {
-        return data
-      }
-
-      const sortedData = (this.props.orderByMethod || _.orderBy)(
-        data,
-        sorted.map(sort => {
-          // Support custom sorting methods for each column
-          if (sortMethodsByColumnID[sort.id]) {
-            return (a, b) => {
-              return sortMethodsByColumnID[sort.id](a[sort.id], b[sort.id], sort.desc)
-            }
-          }
-          return (a, b) => {
-            return this.props.defaultSortMethod(a[sort.id], b[sort.id], sort.desc)
-          }
-        }),
-        sorted.map(d => !d.desc),
-        this.props.indexKey
-      )
-
-      sortedData.forEach(row => {
-        if (!row[this.props.subRowsKey]) {
-          return
-        }
-        row[this.props.subRowsKey] = this.sortData(
-          row[this.props.subRowsKey],
-          sorted,
-          sortMethodsByColumnID
-        )
-      })
-
-      return sortedData
-    }
-
-    getMinRows () {
-      return _.getFirstDefined(
-        this.props.minRows,
-        this.getStateOrProp('pageSize')
-      )
-    }
-
-    // User actions
-    onPageChange (page) {
-      const { onPageChange, collapseOnPageChange } = this.props
-
-      const newState = { page }
-      if (collapseOnPageChange) {
-        newState.expanded = {}
-      }
-      this.setStateWithData(newState, () => {
-        onPageChange && onPageChange(page)
-      })
-    }
-
-    onPageSizeChange (newPageSize) {
-      const { onPageSizeChange } = this.props
-      const { pageSize, page } = this.getResolvedState()
-
-      // Normalize the page to display
-      const currentRow = pageSize * page
-      const newPage = Math.floor(currentRow / newPageSize)
-
-      this.setStateWithData(
-        {
-          pageSize: newPageSize,
-          page: newPage,
-        },
-        () => {
-          onPageSizeChange && onPageSizeChange(newPageSize, newPage)
-        }
-      )
-    }
-
-    sortColumn (column, additive) {
-      const { sorted, skipNextSort, defaultSortDesc } = this.getResolvedState()
-
-      const firstSortDirection = column.hasOwnProperty('defaultSortDesc')
-        ? column.defaultSortDesc
-        : defaultSortDesc
-      const secondSortDirection = !firstSortDirection
-
-      // we can't stop event propagation from the column resize move handlers
-      // attached to the document because of react's synthetic events
-      // so we have to prevent the sort function from actually sorting
-      // if we click on the column resize element within a header.
-      if (skipNextSort) {
-        this.setStateWithData({
-          skipNextSort: false,
-        })
-        return
-      }
-
-      const { onSortedChange } = this.props
-
-      let newSorted = _.clone(sorted || []).map(d => {
-        d.desc = _.isSortingDesc(d)
-        return d
-      })
-      if (!_.isArray(column)) {
-        // Single-Sort
-        const existingIndex = newSorted.findIndex(d => d.id === column.id)
-        if (existingIndex > -1) {
-          const existing = newSorted[existingIndex]
-          if (existing.desc === secondSortDirection) {
-            if (additive) {
-              newSorted.splice(existingIndex, 1)
-            } else {
-              existing.desc = firstSortDirection
-              newSorted = [existing]
-            }
-          } else {
-            existing.desc = secondSortDirection
-            if (!additive) {
-              newSorted = [existing]
-            }
-          }
-        } else {
-          if (additive) {
-            newSorted.push({
-              id: column.id,
-              desc: firstSortDirection,
-            })
-          } else {
-            newSorted = [
-              {
-                id: column.id,
-                desc: firstSortDirection,
-              },
-            ]
-          }
-        }
-      } else {
-        // Multi-Sort
-        const existingIndex = newSorted.findIndex(d => d.id === column[0].id)
-        // Existing Sorted Column
-        if (existingIndex > -1) {
-          const existing = newSorted[existingIndex]
-          if (existing.desc === secondSortDirection) {
-            if (additive) {
-              newSorted.splice(existingIndex, column.length)
-            } else {
-              column.forEach((d, i) => {
-                newSorted[existingIndex + i].desc = firstSortDirection
-              })
-            }
-          } else {
-            column.forEach((d, i) => {
-              newSorted[existingIndex + i].desc = secondSortDirection
-            })
-          }
-          if (!additive) {
-            newSorted = newSorted.slice(existingIndex, column.length)
-          }
-        } else {
-          // New Sort Column
-          if (additive) {
-            newSorted = newSorted.concat(
-              column.map(d => ({
-                id: d.id,
-                desc: firstSortDirection,
-              }))
-            )
-          } else {
-            newSorted = column.map(d => ({
-              id: d.id,
-              desc: firstSortDirection,
-            }))
-          }
-        }
-      }
-
-      this.setStateWithData(
-        {
-          page:
-            (!sorted.length && newSorted.length) || !additive
-              ? 0
-              : this.state.page,
-          sorted: newSorted,
-        },
-        () => {
-          onSortedChange && onSortedChange(newSorted, column, additive)
-        }
-      )
-    }
-
-    filterColumn (column, value) {
-      const { filtered } = this.getResolvedState()
-      const { onFilteredChange } = this.props
-
-      // Remove old filter first if it exists
-      const newFiltering = (filtered || []).filter(x => {
-        if (x.id !== column.id) {
-          return true
-        }
-      })
-
-      if (value !== '') {
-        newFiltering.push({
-          id: column.id,
-          value: value,
-        })
-      }
-
-      this.setStateWithData(
-        {
-          filtered: newFiltering,
-        },
-        () => {
-          onFilteredChange && onFilteredChange(newFiltering, column, value)
-        }
-      )
-    }
-
-    resizeColumnStart (event, column, isTouch) {
-      event.stopPropagation()
-      const parentWidth = event.target.parentElement.getBoundingClientRect()
-        .width
-
-      let pageX
-      if (isTouch) {
-        pageX = event.changedTouches[0].pageX
-      } else {
-        pageX = event.pageX
-      }
-
-      this.trapEvents = true
-      this.setStateWithData(
-        {
-          currentlyResizing: {
-            id: column.id,
-            startX: pageX,
-            parentWidth: parentWidth,
-          },
-        },
-        () => {
-          if (isTouch) {
-            document.addEventListener('touchmove', this.resizeColumnMoving)
-            document.addEventListener('touchcancel', this.resizeColumnEnd)
-            document.addEventListener('touchend', this.resizeColumnEnd)
-          } else {
-            document.addEventListener('mousemove', this.resizeColumnMoving)
-            document.addEventListener('mouseup', this.resizeColumnEnd)
-            document.addEventListener('mouseleave', this.resizeColumnEnd)
-          }
-        }
-      )
-    }
-
-    resizeColumnMoving (event) {
-      event.stopPropagation()
-      const { onResizedChange } = this.props
-      const { resized, currentlyResizing } = this.getResolvedState()
-
-      // Delete old value
-      const newResized = resized.filter(x => x.id !== currentlyResizing.id)
-
-      let pageX
-
-      if (event.type === 'touchmove') {
-        pageX = event.changedTouches[0].pageX
-      } else if (event.type === 'mousemove') {
-        pageX = event.pageX
-      }
-
-      // Set the min size to 10 to account for margin and border or else the group headers don't line up correctly
-      const newWidth = Math.max(
-        currentlyResizing.parentWidth + pageX - currentlyResizing.startX,
-        11
-      )
-
-      newResized.push({
-        id: currentlyResizing.id,
-        value: newWidth,
-      })
-
-      this.setStateWithData(
-        {
-          resized: newResized,
-        },
-        () => {
-          onResizedChange && onResizedChange(newResized, event)
-        }
-      )
-    }
-
-    resizeColumnEnd (event) {
-      event.stopPropagation()
-      let isTouch = event.type === 'touchend' || event.type === 'touchcancel'
-
-      if (isTouch) {
-        document.removeEventListener('touchmove', this.resizeColumnMoving)
-        document.removeEventListener('touchcancel', this.resizeColumnEnd)
-        document.removeEventListener('touchend', this.resizeColumnEnd)
-      }
-
-      // If its a touch event clear the mouse one's as well because sometimes
-      // the mouseDown event gets called as well, but the mouseUp event doesn't
-      document.removeEventListener('mousemove', this.resizeColumnMoving)
-      document.removeEventListener('mouseup', this.resizeColumnEnd)
-      document.removeEventListener('mouseleave', this.resizeColumnEnd)
-
-      // The touch events don't propagate up to the sorting's onMouseDown event so
-      // no need to prevent it from happening or else the first click after a touch
-      // event resize will not sort the column.
-      if (!isTouch) {
-        this.setStateWithData({
-          skipNextSort: true,
-          currentlyResizing: false,
-        })
-      }
-    }
-  }

src/pagination.js

@@ -1,144 +0,0 @@
-import React, { Component } from 'react'
-import classnames from 'classnames'
-//
-// import _ from './utils'
-
-const defaultButton = props => (
-  <button type='button' {...props} className='-btn'>
-    {props.children}
-  </button>
-)
-
-export default class ReactTablePagination extends Component {
-  constructor (props) {
-    super()
-
-    this.getSafePage = this.getSafePage.bind(this)
-    this.changePage = this.changePage.bind(this)
-    this.applyPage = this.applyPage.bind(this)
-
-    this.state = {
-      page: props.page,
-    }
-  }
-
-  componentWillReceiveProps (nextProps) {
-    this.setState({ page: nextProps.page })
-  }
-
-  getSafePage (page) {
-    if (isNaN(page)) {
-      page = this.props.page
-    }
-    return Math.min(Math.max(page, 0), this.props.pages - 1)
-  }
-
-  changePage (page) {
-    page = this.getSafePage(page)
-    this.setState({ page })
-    if (this.props.page !== page) {
-      this.props.onPageChange(page)
-    }
-  }
-
-  applyPage (e) {
-    e && e.preventDefault()
-    const page = this.state.page
-    this.changePage(page === '' ? this.props.page : page)
-  }
-
-  render () {
-    const {
-      // Computed
-      pages,
-      // Props
-      page,
-      showPageSizeOptions,
-      pageSizeOptions,
-      pageSize,
-      showPageJump,
-      canPrevious,
-      canNext,
-      onPageSizeChange,
-      className,
-      PreviousComponent = defaultButton,
-      NextComponent = defaultButton,
-    } = this.props
-
-    return (
-      <div
-        className={classnames(className, '-pagination')}
-        style={this.props.paginationStyle}
-      >
-        <div className='-previous'>
-          <PreviousComponent
-            onClick={e => {
-              if (!canPrevious) return
-              this.changePage(page - 1)
-            }}
-            disabled={!canPrevious}
-          >
-            {this.props.previousText}
-          </PreviousComponent>
-        </div>
-        <div className='-center'>
-          <span className='-pageInfo'>
-            {this.props.pageText}{' '}
-            {showPageJump
-              ? <div className='-pageJump'>
-                <input
-                  type={this.state.page === '' ? 'text' : 'number'}
-                  onChange={e => {
-                    const val = e.target.value
-                    const page = val - 1
-                    if (val === '') {
-                      return this.setState({ page: val })
-                    }
-                    this.setState({ page: this.getSafePage(page) })
-                  }}
-                  value={this.state.page === '' ? '' : this.state.page + 1}
-                  onBlur={this.applyPage}
-                  onKeyPress={e => {
-                    if (e.which === 13 || e.keyCode === 13) {
-                      this.applyPage()
-                    }
-                  }}
-                />
-              </div>
-              : <span className='-currentPage'>
-                {page + 1}
-              </span>}{' '}
-            {this.props.ofText}{' '}
-            <span className='-totalPages'>{pages || 1}</span>
-          </span>
-          {showPageSizeOptions &&
-            <span className='select-wrap -pageSizeOptions'>
-              <select
-                onChange={e => onPageSizeChange(Number(e.target.value))}
-                value={pageSize}
-              >
-                {pageSizeOptions.map((option, i) => {
-                  return (
-                    <option key={i} value={option}>
-                      {option} {this.props.rowsText}
-                    </option>
-                  )
-                })}
-              </select>
-            </span>}
-        </div>
-        <div className='-next'>
-          <NextComponent
-            onClick={e => {
-              if (!canNext) return
-              this.changePage(page + 1)
-            }}
-            disabled={!canNext}
-          >
-            {this.props.nextText}
-          </NextComponent>
-        </div>
-      </div>
-    )
-  }
-}

src/propTypes.js

@@ -1,191 +0,0 @@
-import PropTypes from "prop-types";
-
-export default {
-  // General
-  data: PropTypes.array,
-  loading: PropTypes.bool,
-  showPagination: PropTypes.bool,
-  showPaginationTop: PropTypes.bool,
-  showPaginationBottom: PropTypes.bool,
-  showPageSizeOptions: PropTypes.bool,
-  pageSizeOptions: PropTypes.array,
-  defaultPageSize: PropTypes.number,
-  showPageJump: PropTypes.bool,
-  collapseOnSortingChange: PropTypes.bool,
-  collapseOnPageChange: PropTypes.bool,
-  collapseOnDataChange: PropTypes.bool,
-  freezeWhenExpanded: PropTypes.bool,
-  sortable: PropTypes.bool,
-  resizable: PropTypes.bool,
-  filterable: PropTypes.bool,
-  defaultSortDesc: PropTypes.bool,
-  defaultSorted: PropTypes.array,
-  defaultFiltered: PropTypes.array,
-  defaultResized: PropTypes.array,
-  defaultExpanded: PropTypes.object,
-  defaultFilterMethod: PropTypes.func,
-  defaultSortMethod: PropTypes.func,
-
-  // Controlled State Callbacks
-  onPageChange: PropTypes.func,
-  onPageSizeChange: PropTypes.func,
-  onSortedChange: PropTypes.func,
-  onFilteredChange: PropTypes.func,
-  onResizedChange: PropTypes.func,
-  onExpandedChange: PropTypes.func,
-
-  // Pivoting
-  pivotBy: PropTypes.array,
-
-  // Key Constants
-  pivotValKey: PropTypes.string,
-  pivotIDKey: PropTypes.string,
-  subRowsKey: PropTypes.string,
-  aggregatedKey: PropTypes.string,
-  nestingLevelKey: PropTypes.string,
-  originalKey: PropTypes.string,
-  indexKey: PropTypes.string,
-  groupedByPivotKey: PropTypes.string,
-
-  // Server-side Callbacks
-  onFetchData: PropTypes.func,
-
-  // Classes
-  className: PropTypes.string,
-  style: PropTypes.object,
-
-  // Component decorators
-  getProps: PropTypes.func,
-  getTableProps: PropTypes.func,
-  getTheadGroupProps: PropTypes.func,
-  getTheadGroupTrProps: PropTypes.func,
-  getTheadGroupThProps: PropTypes.func,
-  getTheadProps: PropTypes.func,
-  getTheadTrProps: PropTypes.func,
-  getTheadThProps: PropTypes.func,
-  getTheadFilterProps: PropTypes.func,
-  getTheadFilterTrProps: PropTypes.func,
-  getTheadFilterThProps: PropTypes.func,
-  getTbodyProps: PropTypes.func,
-  getTrGroupProps: PropTypes.func,
-  getTrProps: PropTypes.func,
-  getTdProps: PropTypes.func,
-  getTfootProps: PropTypes.func,
-  getTfootTrProps: PropTypes.func,
-  getTfootTdProps: PropTypes.func,
-  getPaginationProps: PropTypes.func,
-  getLoadingProps: PropTypes.func,
-  getNoDataProps: PropTypes.func,
-  getResizerProps: PropTypes.func,
-
-  // Global Column Defaults
-  columns: PropTypes.shape({
-    // Renderers
-    Cell: PropTypes.oneOfType([
-      PropTypes.element,
-      PropTypes.string,
-      PropTypes.func
-    ]),
-    Header: PropTypes.oneOfType([
-      PropTypes.element,
-      PropTypes.string,
-      PropTypes.func
-    ]),
-    Footer: PropTypes.oneOfType([
-      PropTypes.element,
-      PropTypes.string,
-      PropTypes.func
-    ]),
-    Aggregated: PropTypes.oneOfType([
-      PropTypes.element,
-      PropTypes.string,
-      PropTypes.func
-    ]),
-    Pivot: PropTypes.oneOfType([
-      PropTypes.element,
-      PropTypes.string,
-      PropTypes.func
-    ]),
-    PivotValue: PropTypes.oneOfType([
-      PropTypes.element,
-      PropTypes.string,
-      PropTypes.func
-    ]),
-    Expander: PropTypes.oneOfType([
-      PropTypes.element,
-      PropTypes.string,
-      PropTypes.func
-    ]),
-    Filter: PropTypes.oneOfType([PropTypes.element, PropTypes.func]),
-
-    // All Columns
-    sortable: PropTypes.bool, // use table default
-    resizable: PropTypes.bool, // use table default
-    filterable: PropTypes.bool, // use table default
-    show: PropTypes.bool,
-    minWidth: PropTypes.number,
-
-    // Cells only
-    className: PropTypes.string,
-    style: PropTypes.object,
-    getProps: PropTypes.func,
-
-    // Pivot only
-    aggregate: PropTypes.func,
-
-    // Headers only
-    headerClassName: PropTypes.string,
-    headerStyle: PropTypes.object,
-    getHeaderProps: PropTypes.func,
-
-    // Footers only
-    footerClassName: PropTypes.string,
-    footerStyle: PropTypes.object,
-    getFooterProps: PropTypes.object,
-    filterMethod: PropTypes.func,
-    filterAll: PropTypes.bool,
-    sortMethod: PropTypes.func
-  }),
-
-  // Global Expander Column Defaults
-  expanderDefaults: PropTypes.shape({
-    sortable: PropTypes.bool,
-    resizable: PropTypes.bool,
-    filterable: PropTypes.bool,
-    width: PropTypes.number
-  }),
-
-  pivotDefaults: PropTypes.object,
-
-  // Text
-  previousText: PropTypes.node,
-  nextText: PropTypes.node,
-  loadingText: PropTypes.node,
-  noDataText: PropTypes.node,
-  pageText: PropTypes.node,
-  ofText: PropTypes.node,
-  rowsText: PropTypes.node,
-
-  // Components
-  TableComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
-  TheadComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
-  TbodyComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
-  TrGroupComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
-  TrComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
-  ThComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
-  TdComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
-  TfootComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
-  FilterComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
-  ExpanderComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
-  PivotValueComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
-  AggregatedComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
-  PivotComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]), // this is a computed default generated using
-  // the ExpanderComponent and PivotValueComponent at run-time in methods.js
-  PaginationComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
-  PreviousComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
-  NextComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
-  LoadingComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
-  NoDataComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
-  ResizerComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
-  PadRowComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element])
-};

src/useFlexLayout.js

@@ -0,0 +1,195 @@
+import { useMemo, useState } from 'react'
+import PropTypes from 'prop-types'
+
+import { getFirstDefined, sum } from './utils'
+
+const propTypes = {
+  defaultFlex: PropTypes.number,
+}
+
+export const actions = {}
+
+export default function useFlexLayout (api, props = {}) {
+  // Validate props
+  PropTypes.checkPropTypes(propTypes, props, 'property', 'useFlexLayout')
+
+  const {
+    hooks: {
+      getRowProps, getHeaderRowProps, getHeaderProps, getCellProps,
+    },
+    visibleColumns,
+  } = api
+
+  const { defaultFlex = 1 } = props
+
+  const [columnMeasurements, setColumnMeasurements] = useState({})
+
+  const rowStyles = useMemo(
+    () => {
+      let sumWidth = 0
+      visibleColumns.forEach(column => {
+        const { width, minWidth } = getSizesForColumn(
+          column,
+          defaultFlex,
+          undefined,
+          undefined,
+          api
+        )
+        if (width) {
+          sumWidth += width
+        } else if (minWidth) {
+          sumWidth += minWidth
+        } else {
+          sumWidth += defaultFlex
+        }
+      })
+
+      return {
+        style: {
+          display: 'flex',
+          minWidth: `${sumWidth}px`,
+        },
+      }
+    },
+    [visibleColumns]
+  )
+
+  getRowProps.push(row => rowStyles)
+  getHeaderRowProps.push(row => rowStyles)
+
+  getHeaderProps.push(column => ({
+    style: {
+      boxSizing: 'border-box',
+      ...getStylesForColumn(column, columnMeasurements, defaultFlex, api),
+    },
+    // [refKey]: el => {
+    //   renderedCellInfoRef.current[key] = {
+    //     column,
+    //     el
+    //   };
+    // },
+  }))
+
+  getCellProps.push(cell => ({
+    style: {
+      display: 'block',
+      boxSizing: 'border-box',
+      ...getStylesForColumn(cell.column, columnMeasurements, defaultFlex, undefined, api),
+    },
+    // [refKey]: el => {
+    //   renderedCellInfoRef.current[columnPathStr] = {
+    //     column,
+    //     el
+    //   };
+    // }
+  }))
+
+  return {
+    rowStyles,
+  }
+}
+
+function getStylesForColumn (column, columnMeasurements, defaultFlex, api) {
+  const { flex, width, maxWidth } = getSizesForColumn(column, columnMeasurements, defaultFlex, api)
+
+  return {
+    flex: `${flex} 0 auto`,
+    width: `${width}px`,
+    maxWidth: `${maxWidth}px`,
+  }
+}
+
+function getSizesForColumn (
+  {
+    columns, id, width, minWidth, maxWidth,
+  },
+  columnMeasurements,
+  defaultFlex,
+  api
+) {
+  if (columns) {
+    columns = columns
+      .map(column => getSizesForColumn(column, columnMeasurements, defaultFlex, api))
+      .filter(Boolean)
+
+    if (!columns.length) {
+      return false
+    }
+
+    const flex = sum(columns.map(col => col.flex))
+    const width = sum(columns.map(col => col.width))
+    const maxWidth = sum(columns.map(col => col.maxWidth))
+
+    return {
+      flex,
+      width,
+      maxWidth,
+    }
+  }
+
+  return {
+    flex: width ? 0 : defaultFlex,
+    width:
+      width === 'auto'
+        ? columnMeasurements[id] || defaultFlex
+        : getFirstDefined(width, minWidth, defaultFlex),
+    maxWidth,
+  }
+}
+
+// const resetRefs = () => {
+//   if (debug) console.info("resetRefs");
+//   renderedCellInfoRef.current = {};
+// };
+
+// const calculateAutoWidths = () => {
+//   RAF(() => {
+//     const newColumnMeasurements = {};
+//     Object.values(renderedCellInfoRef.current).forEach(({ column, el }) => {
+//       if (!el) {
+//         return;
+//       }
+
+//       let measurement = 0;
+
+//       const measureChildren = children => {
+//         if (children) {
+//           [].slice.call(children).forEach(child => {
+//             measurement = Math.max(
+//               measurement,
+//               Math.ceil(child.offsetWidth) || 0
+//             );
+//             measureChildren(child.children);
+//           });
+//         }
+//         return measurement;
+//       };
+
+//       const parentDims = getElementDimensions(el);
+//       measureChildren(el.children);
+
+//       newColumnMeasurements[column.id] = Math.max(
+//         newColumnMeasurements[column.id] || 0,
+//         measurement + parentDims.paddingLeft + parentDims.paddingRight
+//       );
+//     });
+
+//     const oldKeys = Object.keys(columnMeasurements);
+//     const newKeys = Object.keys(newColumnMeasurements);
+
+//     const needsUpdate =
+//       oldKeys.length !== newKeys.length ||
+//       oldKeys.some(key => {
+//         return columnMeasurements[key] !== newColumnMeasurements[key];
+//       });
+
+//     if (needsUpdate) {
+//       setState(old => {
+//         return {
+//           ...old,
+//           columnMeasurements: newColumnMeasurements
+//         };
+//       }, actions.updateAutoWidth);
+//     }
+//   });
+// };

src/usePagination.js

@@ -0,0 +1,155 @@
+import { useMemo, useState, useLayoutEffect } from 'react'
+import PropTypes from 'prop-types'
+
+import { warnUnknownProps } from './utils'
+import useControlledState from './hooks/useControlledState'
+
+const propTypes = {
+  defaultPageSize: PropTypes.number,
+  defaultPageIndex: PropTypes.number,
+  pageSize: PropTypes.number,
+  pages: PropTypes.number,
+  pageIndex: PropTypes.number,
+  onStateChange: PropTypes.func,
+  stateReducer: PropTypes.func,
+  subRowsKey: PropTypes.string,
+  debug: PropTypes.bool,
+}
+
+export const actions = {
+  pageChange: '__pageChange__',
+}
+
+export default function usePagination (
+  {
+    debug: parentDebug, rows, prepareRows, groupedRows, sortedRows, filteredRows,
+  },
+  props = {}
+) {
+  // Validate props
+  PropTypes.checkPropTypes(propTypes, props, 'property', 'usePagination')
+
+  // Destructure props
+  const {
+    defaultPageSize = 10,
+    defaultPageIndex = 0,
+    pageSize: userPageSize,
+    pageIndex: userPageIndex,
+    state: userState,
+    manualPagination,
+    pageCount: userPageCount,
+    pageOptions: userPageOptions,
+    debug = parentDebug,
+    ...rest
+  } = props
+
+  warnUnknownProps(rest)
+
+  const defaultState = useState({})
+  const localState = userState || defaultState
+
+  // Build the controllable state
+  const [{ pageSize, pageIndex }, setState] = useControlledState(
+    localState,
+    {
+      pageSize: defaultPageSize,
+      pageIndex: defaultPageIndex,
+    },
+    {
+      pageSize: userPageSize,
+      pageIndex: userPageIndex,
+    }
+  )
+
+  useLayoutEffect(
+    () => {
+      if (manualPagination) {
+        return
+      }
+      setState(
+        old => ({
+          ...old,
+          pageIndex: 0,
+        }),
+        actions.pageChange
+      )
+    },
+    [groupedRows, sortedRows, filteredRows]
+  )
+
+  const { pages, pageCount } = useMemo(
+    () => {
+      if (manualPagination) {
+        return {
+          pages: [rows],
+          pageCount: userPageCount,
+        }
+      }
+      if (debug) console.info('getPages')
+
+      // Create a new pages with the first page ready to go.
+      const pages = rows.length ? [] : [[]]
+
+      // Start the pageIndex and currentPage cursors
+      let cursor = 0
+      while (cursor < rows.length) {
+        const end = cursor + pageSize
+        pages.push(rows.slice(cursor, end))
+        cursor = end
+      }
+
+      const pageCount = pages.length
+
+      return {
+        pages,
+        pageCount,
+        pageOptions,
+      }
+    },
+    [rows, pageSize, userPageCount]
+  )
+
+  const pageOptions = [...new Array(pageCount)].map((d, i) => i)
+  const page = manualPagination ? rows : pages[pageIndex] || []
+  const canPreviousPage = pageIndex > 0
+  const canNextPage = pageIndex < pageCount - 1
+
+  const gotoPage = pageIndex => {
+    if (debug) console.info('gotoPage')
+    return setState(old => {
+      if (pageIndex < 0 || pageIndex > pageCount - 1) {
+        return old
+      }
+      return {
+        ...old,
+        pageIndex,
+      }
+    }, actions.pageChange)
+  }
+
+  const previousPage = () => gotoPage(pageIndex - 1)
+
+  const nextPage = () => gotoPage(pageIndex + 1)
+
+  const setPageSize = pageSize => {
+    setState(old => ({
+      ...old,
+      pageSize,
+    }))
+  }
+
+  prepareRows(page)
+
+  return {
+    pages,
+    pageIndex,
+    pageOptions,
+    page,
+    canPreviousPage,
+    canNextPage,
+    gotoPage,
+    previousPage,
+    nextPage,
+    setPageSize,
+  }
+}

src/useReactTable.js

@@ -0,0 +1,470 @@
+import { useState, useMemo, useRef } from 'react'
+import PropTypes from 'prop-types'
+//
+import {
+  defaultOrderByFn,
+  defaultSortByFn,
+  defaultGroupByFn,
+  defaultFilterFn,
+  flexRender,
+  findExpandedDepth,
+  applyHooks,
+  mergeProps,
+  warnUnknownProps,
+} from './utils'
+
+// Internal Hooks
+import useControlledState from './hooks/useControlledState'
+import useColumns from './hooks/useColumns'
+import useTableMethods from './hooks/useTableMethods'
+import useAccessedRows from './hooks/useAccessedRows'
+import useGroupedRows from './hooks/useGroupedRows'
+import useFilteredRows from './hooks/useFilteredRows'
+import useSortedRows from './hooks/useSortedRows'
+import useExpandedRows from './hooks/useExpandedRows'
+
+const defaultFlex = 1
+const renderErr =
+  'You must specify a render "type". This could be "Header", "Filter", or any other custom renderers you have set on your column.'
+
+export const actions = {
+  sortByChange: '__sortByChange',
+  updateAutoWidth: '__updateAutoWidth__',
+  toggleGroupBy: '__toggleGroupBy__',
+  toggleExpanded: '__toggleExpanded__',
+  setExpanded: '__setExpanded__',
+  setFilter: '__setFilter__',
+  setAllFilters: '__setAllFilters__',
+}
+
+const propTypes = {
+  // General
+  data: PropTypes.any,
+  columns: PropTypes.arrayOf(
+    PropTypes.shape({
+      aggregate: PropTypes.func,
+      filterFn: PropTypes.func,
+      filterAll: PropTypes.bool,
+      sortByFn: PropTypes.func,
+      resolvedDefaultSortDesc: PropTypes.bool,
+      canSortBy: PropTypes.bool,
+      canGroupBy: PropTypes.bool,
+      Cell: PropTypes.any,
+      Header: PropTypes.any,
+      Filter: PropTypes.any,
+    })
+  ),
+  defaultFilters: PropTypes.array,
+  defaultSortBy: PropTypes.array,
+  defaultGroupBy: PropTypes.array,
+
+  groupBy: PropTypes.array,
+  filters: PropTypes.array,
+  sortBy: PropTypes.array,
+
+  filterFn: PropTypes.func,
+  sortByFn: PropTypes.func,
+  orderByFn: PropTypes.func,
+  groupByFn: PropTypes.func,
+
+  manualGrouping: PropTypes.bool,
+  manualFilters: PropTypes.bool,
+  manualSorting: PropTypes.bool,
+
+  disableGrouping: PropTypes.bool,
+  disableFilters: PropTypes.bool,
+  disableSorting: PropTypes.bool,
+
+  defaultSortDesc: PropTypes.bool,
+  disableMultiSort: PropTypes.bool,
+  subRowsKey: PropTypes.string,
+  expandedKey: PropTypes.string,
+  userAggregations: PropTypes.object,
+
+  debug: PropTypes.bool,
+}
+
+export default function useReactTable (props) {
+  // Validate props
+  PropTypes.checkPropTypes(propTypes, props, 'property', 'useReactTable')
+
+  // Destructure props
+  const {
+    data = [],
+    state: userState,
+    columns: userColumns,
+    sortBy: userSortBy,
+    groupBy: userGroupBy,
+    filters: userFilters,
+    expanded: userExpanded,
+    defaultSortBy = [],
+    defaultGroupBy = [],
+    defaultFilters = {},
+    defaultExpanded = {},
+    manualGrouping,
+    manualFilters,
+    manualSorting,
+    disableSorting,
+    disableGrouping,
+    disableFilters,
+    defaultSortDesc,
+    disableMultiSort,
+    subRowsKey = 'subRows',
+    expandedKey = 'expanded',
+    filterFn = defaultFilterFn,
+    sortByFn = defaultSortByFn,
+    orderByFn = defaultOrderByFn,
+    groupByFn = defaultGroupByFn,
+    userAggregations = {},
+    debug,
+    ...rest
+  } = props
+
+  warnUnknownProps(rest)
+
+  const defaultState = useState({})
+
+  const localState = userState || defaultState
+
+  // Build the controllable state
+  const [{
+    sortBy, groupBy, filters, expanded,
+  }, setState] = useControlledState(
+    localState,
+    {
+      sortBy: defaultSortBy,
+      groupBy: defaultGroupBy,
+      filters: defaultFilters,
+      expanded: defaultExpanded,
+    },
+    {
+      sortBy: userSortBy,
+      groupBy: userGroupBy,
+      filters: userFilters,
+      expanded: userExpanded,
+    }
+  )
+
+  const expandedDepth = findExpandedDepth(expanded)
+  const renderedCellInfoRef = useRef({})
+
+  // Build the base column
+  let { columns, headerGroups, headers } = useColumns({
+    debug,
+    groupBy,
+    userColumns,
+    defaultFlex,
+    renderedCellInfoRef,
+    disableSorting,
+    disableGrouping,
+    disableFilters,
+  })
+
+  // Use data and columns as memoization
+  const accessedRows = useAccessedRows({
+    debug,
+    data,
+    columns,
+    subRowsKey,
+  })
+
+  // Use rows and groupBy as memoization for row grouping
+  const groupedRows = useGroupedRows({
+    debug,
+    rows: accessedRows,
+    groupBy,
+    columns,
+    groupByFn,
+    manualGrouping,
+    userAggregations,
+  })
+
+  const filteredRows = useFilteredRows({
+    debug,
+    rows: groupedRows,
+    filters,
+    columns,
+    filterFn,
+    manualFilters,
+  })
+
+  const sortedRows = useSortedRows({
+    debug,
+    rows: filteredRows,
+    sortBy,
+    columns,
+    orderByFn,
+    sortByFn,
+    manualSorting,
+  })
+
+  const rows = useExpandedRows({
+    debug,
+    rows: sortedRows,
+    expanded,
+    expandedKey,
+    columns,
+    groupBy,
+    setState,
+    actions,
+  })
+
+  // Mutate columns to reflect sorting state
+  columns.forEach(column => {
+    const { id } = column
+    column.sorted = sortBy.find(d => d.id === id)
+    column.sortedIndex = sortBy.findIndex(d => d.id === id)
+    column.sortedDesc = column.sorted ? column.sorted.desc : undefined
+    column.filterVal = filters[id]
+  })
+
+  // Public API
+
+  const {
+    toggleExpandedByPath,
+    toggleSortByID,
+    toggleGroupBy,
+    setFilter,
+    setAllFilters,
+  } = useTableMethods({
+    debug,
+    setState,
+    actions,
+    groupBy,
+    columns,
+    defaultSortDesc,
+    filters,
+  })
+
+  const state = {
+    // State
+    columns,
+    expandedDepth,
+    accessedRows,
+    groupedRows,
+    filteredRows,
+    sortedRows,
+    rows,
+    headerGroups,
+    renderedCellInfoRef,
+    disableMultiSort,
+
+    // Controllable state
+    groupBy,
+    filters,
+    sortBy,
+    expanded,
+  }
+
+  const api = {
+    // State manager,
+    ...state,
+
+    // Methods
+    toggleExpandedByPath,
+    toggleSortByID,
+    toggleGroupBy,
+    setFilter,
+    setAllFilters,
+  }
+
+  columns.forEach(column => attachApi(column, api))
+  headers.forEach(header => attachApi(header, api))
+
+  const visibleColumns = columns.filter(column => {
+    column.visible = typeof column.show === 'function' ? column.show(state) : !!column.show
+    return column.visible
+  })
+
+  state.visibleColumns = visibleColumns
+  api.visibleColumns = visibleColumns
+
+  api.hooks = {
+    getTableProps: [],
+    getRowProps: [],
+    getHeaderRowProps: [],
+    getCellProps: [],
+    getHeaderProps: [],
+    getSortByToggleProps: [],
+    getGroupByToggleProps: [],
+  }
+
+  api.getTableProps = props => mergeProps(
+    {
+      style: {
+        overflowX: 'auto',
+      },
+    },
+    applyHooks(api.hooks.getTableProps),
+    props
+  )
+
+  api.getRowProps = props => mergeProps(applyHooks(api.hooks.getRowProps), props)
+
+  // Filter out hidden header groups or header groups that
+  // have no visible columns, then add the getRowProps method
+  headerGroups = useMemo(
+    () =>
+      headerGroups.filter((headerGroup, i) => {
+        headerGroup.headers = headerGroup.headers.filter(header => {
+          const recurse = columns => columns.filter(column => {
+            if (column.columns) {
+              return recurse(column.columns)
+            }
+            return column.visible
+          }).length
+          if (header.columns) {
+            return recurse(header.columns)
+          }
+          return header.visible
+        })
+
+        if (headerGroup.headers.length) {
+          headerGroup.getRowProps = (props = {}) => mergeProps(
+            {
+              key: [`header${i}`].join('_'),
+            },
+            applyHooks(api.hooks.getHeaderRowProps, headerGroup),
+            props
+          )
+          return true
+        }
+
+        return false
+      }),
+    [headerGroups]
+  )
+
+  // A function that mutates and prepares page rows with methods
+  api.prepareRows = rows => {
+    rows.forEach((row, i) => {
+      const { path } = row
+      row.getRowProps = props => mergeProps(
+        { key: ['row', i].join('_') },
+        applyHooks(api.hooks.getRowProps, row),
+        props
+      )
+
+      row.toggleExpanded = set => toggleExpandedByPath(path, set)
+
+      row.cells = row.cells.filter(cell => cell.column.visible);
+      [row.groupByCell, ...row.cells].forEach(cell => {
+        if (!cell) {
+          return
+        }
+
+        const { column } = cell
+
+        cell.getCellProps = props => {
+          const columnPathStr = [i, column.id].join('_')
+          return mergeProps(
+            {
+              key: ['cell', columnPathStr].join('_'),
+            },
+            applyHooks(api.hooks.getCellProps, cell),
+            props
+          )
+        }
+
+        cell.render = (type, userProps = {}) => {
+          if (!type) {
+            throw new Error(
+              'You must specify a render "type". This could be "Cell", "Header", "Filter", "Aggregated" or any other custom renderers you have set on your column.'
+            )
+          }
+          return flexRender(column[type], {
+            ...api,
+            ...cell,
+            ...userProps,
+          })
+        }
+      })
+    })
+  }
+
+  const makeHook = api => {
+    api.hook = (hook, ...args) => {
+      const result = hook(api, ...args) || {}
+      const newApi = {
+        ...api,
+        ...result,
+      }
+      makeHook(newApi)
+      return newApi
+    }
+  }
+
+  makeHook(api)
+
+  return api
+}
+
+function attachApi (column, api) {
+  const {
+    id, canSortBy, canGroupBy, canFilter,
+  } = column
+  const { toggleSortByID, toggleGroupBy, setFilter } = api
+
+  column.render = (type, userProps = {}) => {
+    if (!type) {
+      throw new Error(renderErr)
+    }
+    return flexRender(column[type], {
+      ...api,
+      ...column,
+      ...userProps,
+    })
+  }
+
+  if (canSortBy) {
+    column.toggleSortBy = (desc, multi) => toggleSortByID(id, desc, multi)
+  }
+  if (canGroupBy) {
+    column.toggleGroupBy = () => toggleGroupBy(id)
+  }
+  if (canFilter) {
+    column.setFilter = val => setFilter(id, val)
+  }
+
+  column.getSortByToggleProps = props => mergeProps(
+    {
+      onClick: canSortBy
+        ? e => {
+          e.persist()
+          column.toggleSortBy(undefined, !api.disableMultiSort && e.shiftKey)
+        }
+        : undefined,
+      style: {
+        cursor: canSortBy ? 'pointer' : undefined,
+      },
+      title: 'Toggle SortBy',
+    },
+    applyHooks(api.hooks.getSortByToggleProps, column),
+    props
+  )
+
+  column.getGroupByToggleProps = props => mergeProps(
+    {
+      onClick: canGroupBy
+        ? e => {
+          e.persist()
+          column.toggleGroupBy()
+        }
+        : undefined,
+      style: {
+        cursor: canGroupBy ? 'pointer' : undefined,
+      },
+      title: 'Toggle GroupBy',
+    },
+    applyHooks(api.hooks.getGroupByToggleProps, column),
+    props
+  )
+
+  column.getHeaderProps = props => mergeProps(
+    {
+      key: ['header', column.id].join('_'),
+    },
+    applyHooks(api.hooks.getHeaderProps, column),
+    props
+  )
+}

src/utils.js

@@ -1,161 +1,162 @@
 import React from 'react'
-import classnames from 'classnames'
-//
-export default {
-  get,
-  set,
-  takeRight,
-  last,
-  orderBy,
-  range,
-  remove,
-  clone,
-  getFirstDefined,
-  sum,
-  makeTemplateComponent,
-  groupBy,
-  isArray,
-  splitProps,
-  compactObject,
-  isSortingDesc,
-  normalizeComponent,
-  asPx,
-}
 
-function get (obj, path, def) {
+export function getBy (obj, path, def) {
   if (!path) {
     return obj
   }
   const pathObj = makePathArray(path)
   let val
   try {
-    val = pathObj.reduce((current, pathPart) => current[pathPart], obj)
-  } catch (e) {}
+    val = pathObj.reduce((cursor, pathPart) => cursor[pathPart], obj)
+  } catch (e) {
+    // continue regardless of error
+  }
   return typeof val !== 'undefined' ? val : def
 }
 
-function set (obj = {}, path, value) {
-  const keys = makePathArray(path)
-  let keyPart
-  let cursor = obj
-  while ((keyPart = keys.shift()) && keys.length) {
-    if (!cursor[keyPart]) {
-      cursor[keyPart] = {}
-    }
-    cursor = cursor[keyPart]
-  }
-  cursor[keyPart] = value
-  return obj
-}
-
-function takeRight (arr, n) {
-  const start = n > arr.length ? 0 : arr.length - n
-  return arr.slice(start)
-}
-
-function last (arr) {
-  return arr[arr.length - 1]
-}
-
-function range (n) {
-  const arr = []
-  for (let i = 0; i < n; i++) {
-    arr.push(n)
-  }
-  return arr
-}
-
-function orderBy (arr, funcs, dirs, indexKey) {
-  return arr.sort((rowA, rowB) => {
-    for (let i = 0; i < funcs.length; i++) {
-      const comp = funcs[i]
+export function defaultOrderByFn (arr, funcs, dirs) {
+  return [...arr].sort((rowA, rowB) => {
+    for (let i = 0; i < funcs.length; i += 1) {
+      const sortFn = funcs[i]
       const desc = dirs[i] === false || dirs[i] === 'desc'
-      const sortInt = comp(rowA, rowB)
-      if (sortInt) {
+      const sortInt = sortFn(rowA, rowB)
+      if (sortInt !== 0) {
         return desc ? -sortInt : sortInt
       }
     }
-    // Use the row index for tie breakers
-    return dirs[0]
-      ? rowA[indexKey] - rowB[indexKey]
-      : rowB[indexKey] - rowA[indexKey]
+    return dirs[0] ? rowA.index - rowB.index : rowB.index - rowA.index
   })
 }
 
-function remove (a, b) {
-  return a.filter(function (o, i) {
-    var r = b(o)
-    if (r) {
-      a.splice(i, 1)
-      return true
-    }
-    return false
-  })
-}
-
-function clone (a) {
-  try {
-    return JSON.parse(
-      JSON.stringify(a, (key, value) => {
-        if (typeof value === 'function') {
-          return value.toString()
-        }
-        return value
-      })
-    )
-  } catch (e) {
-    return a
+export function defaultSortByFn (a, b, desc) {
+  // force null and undefined to the bottom
+  a = a === null || a === undefined ? '' : a
+  b = b === null || b === undefined ? '' : b
+  // force any string values to lowercase
+  a = typeof a === 'string' ? a.toLowerCase() : a
+  b = typeof b === 'string' ? b.toLowerCase() : b
+  // Return either 1 or -1 to indicate a sort priority
+  if (a > b) {
+    return 1
   }
+  if (a < b) {
+    return -1
+  }
+  // returning 0, undefined or any falsey value will defer to the next
+  // sorting mechanism or eventually the columns index via the orderByFn
+  return 0
 }
 
-function getFirstDefined (...args) {
-  for (var i = 0; i < args.length; i++) {
+export function getFirstDefined (...args) {
+  for (let i = 0; i < args.length; i += 1) {
     if (typeof args[i] !== 'undefined') {
       return args[i]
     }
   }
 }
 
-function sum (arr) {
-  return arr.reduce((a, b) => {
-    return a + b
-  }, 0)
-}
-
-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) {
-  return xs.reduce((rv, x, i) => {
-    const resKey = typeof key === 'function' ? key(x, i) : x[key]
-    rv[resKey] = isArray(rv[resKey]) ? rv[resKey] : []
-    rv[resKey].push(x)
-    return rv
+export function defaultGroupByFn (rows, grouper) {
+  return rows.reduce((prev, row, i) => {
+    const resKey = typeof grouper === 'function' ? grouper(row.values, i) : row.values[grouper]
+    prev[resKey] = Array.isArray(prev[resKey]) ? prev[resKey] : []
+    prev[resKey].push(row)
+    return prev
   }, {})
 }
 
-function asPx (value) {
-  value = Number(value)
-  return Number.isNaN(value) ? null : value + 'px'
+export function defaultFilterFn (row, id, value, column) {
+  return row.values[id] !== undefined
+    ? String(row.values[id])
+      .toLowerCase()
+      .includes(String(value).toLowerCase())
+    : true
 }
 
-function isArray (a) {
-  return Array.isArray(a)
+export function setBy (obj = {}, path, value) {
+  const recurse = (obj, depth = 0) => {
+    const key = path[depth]
+    const target = typeof obj[key] !== 'object' ? {} : obj[key]
+    const subValue = depth === path.length - 1 ? value : recurse(target, depth + 1)
+    return {
+      ...obj,
+      [key]: subValue,
+    }
+  }
+
+  return recurse(obj)
 }
 
-// ########################################################################
-// Non-exported Helpers
-// ########################################################################
+export function getElementDimensions (element) {
+  const rect = element.getBoundingClientRect()
+  const style = window.getComputedStyle(element)
+  const margins = {
+    left: parseInt(style.marginLeft),
+    right: parseInt(style.marginRight),
+  }
+  const padding = {
+    left: parseInt(style.paddingLeft),
+    right: parseInt(style.paddingRight),
+  }
+  return {
+    left: Math.ceil(rect.left),
+    width: Math.ceil(rect.width),
+    outerWidth: Math.ceil(rect.width + margins.left + margins.right + padding.left + padding.right),
+    marginLeft: margins.left,
+    marginRight: margins.right,
+    paddingLeft: padding.left,
+    paddingRight: padding.right,
+    scrollWidth: element.scrollWidth,
+  }
+}
+
+export function flexRender (Comp, props) {
+  if (typeof Comp === 'function') {
+    return Object.getPrototypeOf(Comp).isReactComponent ? <Comp {...props} /> : Comp(props)
+  }
+  return Comp
+}
+
+export function findExpandedDepth (obj, depth = 1) {
+  return Object.values(obj).reduce((prev, curr) => {
+    if (typeof curr === 'object') {
+      return Math.max(prev, findExpandedDepth(curr, depth + 1))
+    }
+    return depth
+  }, 0)
+}
+
+export const mergeProps = (...groups) => {
+  let props = {}
+  groups.forEach(({ style = {}, className, ...rest } = {}) => {
+    props = {
+      ...props,
+      ...rest,
+      style: {
+        ...(props.style || {}),
+        ...style,
+      },
+      className: [props.className, className].filter(Boolean).join(' '),
+    }
+  })
+  return props
+}
+
+export const applyHooks = (hooks, ...args) =>
+  hooks.reduce((prev, next) => mergeProps(prev, next(...args)), {})
+
+export const warnUnknownProps = props => {
+  if (Object.keys(props).length) {
+    throw new Error(
+      `Unknown options passed to useReactTable:
+      
+${JSON.stringify(props, null, 2)}`
+    )
+  }
+}
+
+export function sum (arr) {
+  return arr.reduce((prev, curr) => prev + curr, 0)
+}
 
 function makePathArray (obj) {
   return flattenDeep(obj)
@@ -166,46 +167,12 @@ function makePathArray (obj) {
 }
 
 function flattenDeep (arr, newArr = []) {
-  if (!isArray(arr)) {
+  if (!Array.isArray(arr)) {
     newArr.push(arr)
   } else {
-    for (var i = 0; i < arr.length; i++) {
+    for (let i = 0; i < arr.length; i += 1) {
       flattenDeep(arr[i], newArr)
     }
   }
   return newArr
 }
-
-function splitProps ({ className, style, ...rest }) {
-  return {
-    className,
-    style,
-    rest: rest || {},
-  }
-}
-
-function compactObject (obj) {
-  const newObj = {}
-  for (var key in obj) {
-    if (
-      obj.hasOwnProperty(key) &&
-      obj[key] !== undefined &&
-      typeof obj[key] !== 'undefined'
-    ) {
-      newObj[key] = obj[key]
-    }
-  }
-  return newObj
-}
-
-function isSortingDesc (d) {
-  return !!(d.sort === 'desc' || d.desc === true || d.asc === false)
-}
-
-function normalizeComponent (Comp, params = {}, fallback = Comp) {
-  return typeof Comp === 'function'
-    ? Object.getPrototypeOf(Comp).isReactComponent
-      ? <Comp {...params} />
-      : Comp(params)
-    : fallback
-}

umd.webpack.js

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