v6.8.3

.gitattributes

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,38 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-
----
-
-**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](codesandbox.io/s/X6npLXPRW) 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

@@ -1,17 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

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

@@ -1,11 +0,0 @@
----
-name: Questions, Support & Help
-about: Looking for help? Need a question answered?
-
----
-
-STOP!!!
-
-Github issues is no place for general support. We encourage you to 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

@@ -8,4 +8,3 @@ react-table.css
 *.log
 .idea
 .DS_Store
-.history

CHANGELOG.md

@@ -1,73 +1,41 @@
-## 6.10.1
-
-- Fixed issues with `normalizeComponent` function
-
-
-## 6.10.0
-
-- Rebased volatile commits out of 6.9.0
-- Merged (hopefully) non-breaking fixes after rebasing and reverting.
-
-## 6.9.0
-
-This version has been reverted due to some major bugs that were introduced with it.
-
-## 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
+* 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
+* 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
+* Fix Prop types for columns
 
 ## 6.7.3
 
 #### Fixes & Optimizations
 
-- Fix the rest of the proptypes
+* Fix the rest of the proptypes
 
 ## 6.7.2
 
 #### Fixes & Optimizations
 
-- `getPropTypes` proptype check
+* `getPropTypes` proptype check
 
 ## 6.7.1
 
 #### Fixes & Optimizations
 
-- `eslint-config` moved to dev deps
+* `eslint-config` moved to dev deps
 
 ## 6.7.0
 
@@ -75,113 +43,113 @@ This version has been reverted due to some major bugs that were introduced with
 
 #### New Features
 
-- Expose page/pageSize to rows/cells
-- Supply sort direction to custom sort methods
+* 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
+* 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
+* 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
+* `onClick` proxying and eslint
 
 ## 6.5.2
 
 #### New Features
 
-- Provide onClick handleOriginal function - #406
+* Provide onClick handleOriginal function - #406
 
 #### Fixes & Optimizations
 
-- README updates
-- `makePathArray` in utils - #326
-- Various fixes: #294, #376, #398, #415,
+* 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
+* `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

@@ -0,0 +1,18 @@
+## 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/src/App.js

@@ -1,72 +1,69 @@
 /* eslint-disable */
 
-import React from 'react';
+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 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';
-import HOCReadme from './stories/HOCReadme.js';
+import Readme from "./stories/Readme.js";
+import HOCReadme from "./stories/HOCReadme.js";
 
 // import Test from './stories/test.js'
 
 // import Tester from './examples/expander';
 
 const stories = [
-  { name: 'Readme', component: Readme },
-  { name: 'HOC Readme', component: HOCReadme },
+  { name: "Readme", component: Readme },
+  { name: "HOC Readme", component: HOCReadme },
 
   // { name: 'Tester', component: Test },
-  { name: 'Simple Table', component: CodeSandbox('X6npLXPRW') },
+  { name: "Simple Table", component: CodeSandbox("X6npLXPRW") },
   {
-    name: 'Cell Renderers & Custom Components',
-    component: CodeSandbox('OyRL04Z4Y')
+    name: "Cell Renderers & Custom Components",
+    component: CodeSandbox("OyRL04Z4Y")
   },
-  { name: 'Default Sorting', component: CodeSandbox('gLwmmjzA3') },
+  { name: "Default Sorting", component: CodeSandbox("gLwmmjzA3") },
   {
-    name: 'Custom Sorting',
-    component: CodeSandbox('VGx67J35')
+    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: "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: "Pivoting & Aggregation w/ Sub Components",
+    component: CodeSandbox("p0kEVBgQ")
   },
   {
-    name: '100k Rows w/ Pivoting & Sub Components',
-    component: CodeSandbox('DRmKj0XyK')
+    name: "100k Rows w/ Pivoting & Sub Components",
+    component: CodeSandbox("DRmKj0XyK")
   },
-  { name: 'Pivoting Options', component: CodeSandbox('kZKmNBK6r') },
-  { name: 'Functional Rendering', component: CodeSandbox('VPZ0Bzv8X') },
+  { name: "Pivoting Options", component: CodeSandbox("kZKmNBK6r") },
+  { name: "Functional Rendering", component: CodeSandbox("VPZ0Bzv8X") },
   {
-    name: 'Custom Expander Position',
-    component: CodeSandbox('1jj2XrPEV')
+    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: '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: "Fixed Header w/ Vertical Scroll",
+    component: CodeSandbox("7LY0gjA8O")
   },
   {
-    name: 'Multiple Pagers (Top and Bottom)',
-    component: CodeSandbox('VEZ8OgvX')
+    name: "Multiple Pagers (Top and Bottom)",
+    component: CodeSandbox("VEZ8OgvX")
   },
-
-  { name: 'Tree Table (HOC)', component: CodeSandbox('lxmr4wynzq') },
-  { name: 'Select Table (HOC)', component: CodeSandbox('7yq5ylw09j') },
-  { name: 'Select Tree Table (HOC)', component: CodeSandbox('2p7jp4klwp') },
-  { name: 'Foldable Table (HOC)', component: CodeSandbox('8pkrj5yorl') },
-  { name: 'Advanced Expand Table (HOC)', component: CodeSandbox('y2m39jz8v1') }
+  { name: "Tree Table (HOC)", component: CodeSandbox("lxmr4wynzq") },
+  { name: "Select Table (HOC)", component: CodeSandbox("7yq5ylw09j") },
+  { name: "Select Tree Table (HOC)", component: CodeSandbox("2p7jp4klwp") }
 ];
 
 export default class App extends React.Component {
@@ -74,41 +71,41 @@ export default class App extends React.Component {
     return (
       <ReactStory
         style={{
-          display: 'block',
-          width: '100%',
-          height: '100%'
+          display: "block",
+          width: "100%",
+          height: "100%"
         }}
         pathPrefix="story/"
         StoryWrapper={props => (
           <defaultProps.StoryWrapper
             css={{
               padding: 0,
-              display: 'flex',
-              flexDirection: 'column'
+              display: "flex",
+              flexDirection: "column"
             }}
           >
             <a
               href="//github.com/react-tools/react-table"
               style={{
-                display: 'block',
-                textAlign: 'center',
-                borderBottom: 'solid 3px #cccccc'
+                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'
+                  width: "150px",
+                  padding: "10px"
                 }}
               />
             </a>
             <div
               {...props}
               style={{
-                flex: '1 0 auto',
-                position: 'relative'
+                flex: "1 0 auto",
+                position: "relative"
               }}
             />
           </defaultProps.StoryWrapper>

docs/src/examples/advancedexpandtable/index.js

@@ -1,116 +0,0 @@
-import React from 'react';
-import { render } from 'react-dom';
-import { makeData, Logo, Tips } from './Utils';
-import { advancedExpandTableHOC } from '../../../../lib/hoc/advancedExpandTable';
-
-// Import React Table
-import ReactTable from 'react-table';
-import 'react-table/react-table.css';
-
-const columns = [
-  {
-    Header: 'First Name',
-    accessor: 'firstName',
-    Cell: props => {
-      const {
-        // react table props
-        columnProps: { rest: { showRowSubComponent } },
-        nestingPath
-      } = props;
-      return (
-        <div>
-          <button
-            onClick={e => showRowSubComponent({ nestingPath: nestingPath }, e)}
-          >
-            SHOW SUBCOMPONENT {props.value}
-          </button>
-        </div>
-      );
-    }
-  },
-  {
-    Header: 'Last Name',
-    id: 'lastName',
-    accessor: d => d.lastName
-  },
-  {
-    Header: 'Info',
-    columns: [
-      {
-        Header: 'Age',
-        accessor: 'age',
-        Cell: props => {
-          const {
-            // react table props
-            columnProps: { rest: { toggleRowSubComponent } },
-            nestingPath
-          } = props;
-          return (
-            <div>
-              <button
-                onClick={e =>
-                  toggleRowSubComponent({ nestingPath: nestingPath }, e)
-                }
-              >
-                TOGGLE SUBCOMPONENT {props.value}
-              </button>
-            </div>
-          );
-        }
-      },
-      {
-        Header: 'Status',
-        accessor: 'status'
-      }
-    ]
-  },
-  {
-    Header: 'Stats',
-    columns: [
-      {
-        Header: 'Visits',
-        accessor: 'visits'
-      }
-    ]
-  }
-];
-
-const AdvancedExpandReactTable = advancedExpandTableHOC(ReactTable);
-
-class App extends React.Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      data: makeData()
-    };
-  }
-  render() {
-    const { data } = this.state;
-    return (
-      <div>
-        <AdvancedExpandReactTable
-          data={data}
-          columns={columns}
-          defaultPageSize={10}
-          className='-striped -highlight'
-          SubComponent={({ row, nestingPath, toggleRowSubComponent }) => {
-            return (
-              <div style={{ padding: '20px' }}>
-                <button
-                  onClick={e => toggleRowSubComponent({ nestingPath }, e)}
-                >
-                  CLOSE SUBCOMPONENT {row.firstName} {row.lastName}
-                </button>
-              </div>
-            );
-          }}
-        />
-        <br />
-        <Tips />
-        <Logo />
-      </div>
-    );
-  }
-}
-
-render(<App />, document.getElementById('root'));

docs/src/examples/expander/index.js

@@ -47,7 +47,7 @@ export default class ComponentTest extends React.component {
 //     const rtProps = {
 //       data,
 //       columns,
-//       // ExpanderComponent: (props, closeExpanded)=><ExpanderComponent {...props, closeExpanded} />,
+//       // ExpanderComponent: (props)=><ExpanderComponent {...props} />,
 //       // SubComponent: (props)=><SubComponent {...props} />,
 //       // multiSort: false,
 //     }

docs/src/examples/foldabletable/FoldableTableCustomState.js

@@ -1,110 +0,0 @@
-import React from 'react'
-import ReactTable from '../../../../lib/index'
-import FoldableTableHOC from '../../../../lib/hoc/foldableTable'
-import selectTableHOC from '../../../../lib/hoc/selectTable'
-
-const FoldableTable = FoldableTableHOC(selectTableHOC(ReactTable))
-
-export default class FoldableTableCustomState extends React.Component {
-    constructor(props, context) {
-        super(props, context)
-
-        this.state = { folded: {}, seleted: {}, selectedAll: false }
-    }
-
-    getData = () => [{
-        id: 1,
-        first_name: 'Jeanette',
-        'last_name': 'Penddreth',
-        email: 'jpenddreth0@census.gov',
-        'gender': 'Female',
-        ip_address: '26.58.193.2',
-    }, {
-        'id': 2,
-        'first_name': 'Giavani',
-        last_name: 'Frediani',
-        'email': 'gfrediani1@senate.gov',
-        'gender': 'Male',
-        'ip_address': '229.179.4.212',
-    }, {
-        'id': 3,
-        first_name: 'Noell',
-        last_name: 'Bea',
-        'email': 'nbea2@imageshack.us',
-        gender: 'Female',
-        ip_address: '180.66.162.255',
-    }, {
-        'id': 4,
-        'first_name': 'Willard',
-        'last_name': 'Valek',
-        email: 'wvalek3@vk.com',
-        'gender': 'Male',
-        ip_address: '67.76.188.26',
-    }];
-
-    toggleSelection = (key, shift, row) => {
-        const { selected } = this.state
-        let newSelected = Object.assign({}, selected)
-        newSelected[key] = !newSelected[key]
-        this.setState(p => ({ selected: newSelected }))
-    };
-
-    toggleAll = () => {
-        const { selectedAll } = this.state
-
-        if (selectedAll) { this.setState(p => { return { selectedAll: false, seleted: {} } }); }
-        else {
-            const data = this.getData()
-
-            let newSelected = {}
-            data.forEach(d => newSelected[d.id] = true)
-            this.setState(p => ({ selectedAll: true, seleted: newSelected }))
-        }
-    }
-
-    isSelected = key => this.state.seleted[key];
-
-    render() {
-        return (<FoldableTable
-            //SelectTable props
-            keyField='id'
-            toggleSelection={this.toggleSelection}
-            toggleAll={this.toggleAll}
-            isSelected={this.isSelected}
-            selectAll={this.state.selectedAll}
-            selectType='checkbox'
-
-            onFoldChange={newFolded => this.setState(p => { return { folded: newFolded } })}
-            folded={this.state.folded}
-
-            data={this.getData()}
-            columns={[{
-                Header: "Name",
-                foldable: true,
-                columns: [
-                    {
-                        Header: "First Name",
-                        accessor: "first_name"
-                    },
-                    {
-                        Header: "Last Name",
-                        accessor: "last_name"
-                    }
-                ]
-            }, {
-                Header: "Info",
-                foldable: true,
-                columns: [
-                    {
-                        Header: "Email",
-                        accessor: "email"
-                    },
-                    {
-                        Header: "Gender",
-                        accessor: "gender"
-                    }
-                ]
-            }]
-            }></FoldableTable>)
-    }
-}

docs/src/examples/foldabletable/FoldableTableWithHeader.js

@@ -1,71 +0,0 @@
-import React from 'react'
-import ReactTable from '../../../../lib/index'
-import FoldableTableHOC from '../../../../lib/hoc/foldableTable'
-
-const FoldableTable = FoldableTableHOC(ReactTable)
-
-export default class FoldableTableWithHeader extends React.Component {
-
-    getData = () => [{
-        id: 1,
-        first_name: 'Jeanette',
-        last_name: 'Penddreth',
-        'email': 'jpenddreth0@census.gov',
-        gender: 'Female',
-        'ip_address': '26.58.193.2',
-    }, {
-        'id': 2,
-        first_name: 'Giavani',
-        last_name: 'Frediani',
-        email: 'gfrediani1@senate.gov',
-        gender: 'Male',
-        'ip_address': '229.179.4.212',
-    }, {
-        'id': 3,
-        'first_name': 'Noell',
-        last_name: 'Bea',
-        'email': 'nbea2@imageshack.us',
-        'gender': 'Female',
-        ip_address: '180.66.162.255',
-    }, {
-        'id': 4,
-        'first_name': 'Willard',
-        'last_name': 'Valek',
-        email: 'wvalek3@vk.com',
-        'gender': 'Male',
-        ip_address: '67.76.188.26',
-    }];
-
-    render() {
-        return (<FoldableTable
-            data={this.getData()}
-            columns={[{
-                Header: "Name",
-                foldable: true,
-                columns: [
-                    {
-                        Header: "First Name",
-                        accessor: "first_name"
-                    },
-                    {
-                        Header: "Last Name",
-                        accessor: "last_name"
-                    }
-                ]
-            }, {
-                Header: "Info",
-                foldable: true,
-                columns: [
-                    {
-                        Header: "Email",
-                        accessor: "email"
-                    },
-                    {
-                        Header: "Gender",
-                        accessor: "gender"
-                    }
-                ]
-            }]
-            }></FoldableTable>)
-    }
-}

docs/src/examples/foldabletable/FoldableTableWithoutHeader.js

@@ -1,64 +0,0 @@
-import React from 'react';
-import ReactTable from '../../../../lib/index';
-import FoldableTableHOC from '../../../../lib/hoc/foldableTable';
-
-const FoldableTable = FoldableTableHOC(ReactTable);
-
-export default class FoldableTableWithoutHeader extends React.Component {
-
-    getData = () => [{
-        "id": 1,
-        "first_name": "Jeanette",
-        "last_name": "Penddreth",
-        "email": "jpenddreth0@census.gov",
-        "gender": "Female",
-        "ip_address": "26.58.193.2"
-    }, {
-        "id": 2,
-        "first_name": "Giavani",
-        "last_name": "Frediani",
-        "email": "gfrediani1@senate.gov",
-        "gender": "Male",
-        "ip_address": "229.179.4.212"
-    }, {
-        "id": 3,
-        "first_name": "Noell",
-        "last_name": "Bea",
-        "email": "nbea2@imageshack.us",
-        "gender": "Female",
-        "ip_address": "180.66.162.255"
-    }, {
-        "id": 4,
-        "first_name": "Willard",
-        "last_name": "Valek",
-        "email": "wvalek3@vk.com",
-        "gender": "Male",
-        "ip_address": "67.76.188.26"
-    }];
-
-    render() {
-        return <FoldableTable
-            data={this.getData()}
-            columns={[
-                {
-                    Header: "First Name",
-                    accessor: "first_name"
-                },
-                {
-                    Header: "Last Name",
-                    accessor: "last_name",
-                    foldable: true,
-                },
-                {
-                    Header: "Email",
-                    accessor: "email",
-                    foldable: true,
-                },
-                {
-                    Header: "Gender",
-                    accessor: "gender",
-                    foldable: true,
-                }
-            ]}></FoldableTable>
-    }
-}

docs/src/examples/foldabletable/index.js

@@ -1,30 +0,0 @@
-
-import React from 'react'
-import '../../../../react-table.css'
-
-import FoldableTableWithHeader from './FoldableTableWithHeader'
-import FoldableTableWithoutHeader from './FoldableTableWithoutHeader'
-import FoldableTableCustomState from './FoldableTableCustomState'
-
-class FaldableComponentTest extends React.Component {
-    render() {
-
-        return (
-            <div>
-                <p>- Sample With Header Columns</p>
-                <br />
-                <FoldableTableWithHeader />
-                <br /> <br />
-                <p>- Sample With Normal Columns</p>
-                <br />
-                <FoldableTableWithoutHeader />
-                <br /> <br />
-                <p>- Custom State and selectedTable</p>
-                <br />
-                <FoldableTableCustomState />
-            </div >
-        )
-    }
-}
-
-export default FaldableComponentTest

docs/src/examples/index.js

@@ -1,13 +1,7 @@
 /* eslint-disable */
 
-import TreeTable from './treetable'
-import SelectTable from './selecttable'
-import SelectTreeTable from './selecttreetable'
-import FoldableTable from './foldabletable';
+import TreeTable from "./treetable";
+import SelectTable from "./selecttable";
+import SelectTreeTable from "./selecttreetable";
 
-export {
-  TreeTable,
-  SelectTable,
-  SelectTreeTable,
-  FoldableTable
-}
+export { TreeTable, SelectTable, SelectTreeTable };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-table",
-  "version": "6.10.2",
+  "version": "6.8.3",
   "description": "A fast, lightweight, opinionated table and datagrid built on React",
   "license": "MIT",
   "homepage": "https://github.com/react-tools/react-table#readme",
@@ -26,10 +26,10 @@
     "media/*.png"
   ],
   "scripts": {
-    "build:cjs": "babel src --out-dir lib --source-maps inline --copy-files",
-    "build:es": "cross-env BABEL_ENV=es babel src --out-dir es --source-maps inline",
-    "build:umd": "cross-env BABEL_ENV=umd rollup -c",
-    "build:umd-min": "cross-env BABEL_ENV=umd NODE_ENV=production rollup -c",
+    "build:cjs": "babel src --out-dir lib --source-maps inline",
+    "build:es": "BABEL_ENV=es babel src --out-dir es --source-maps inline",
+    "build:umd": "BABEL_ENV=umd rollup -c",
+    "build:umd-min": "BABEL_ENV=umd NODE_ENV=production rollup -c",
     "build:css": "rimraf react-table.css && stylus src/index.styl --compress -o react-table.css && yarn css:autoprefix",
     "css:autoprefix": "postcss --use autoprefixer react-table.css -r",
     "watch": "npm-run-all --parallel watch:*",
@@ -46,9 +46,7 @@
     "classnames": "^2.2.5"
   },
   "peerDependencies": {
-    "prop-types": "^15.5.0",
-    "react": "^15.x.x || ^16.x.x",
-    "react-dom": "^15.x.x || ^16.x.x"
+    "react": "^15.x.x || ^16.x.x"
   },
   "devDependencies": {
     "autoprefixer": "^6.7.0",
@@ -59,7 +57,6 @@
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-preset-env": "^1.6.1",
     "babel-preset-react": "^6.24.1",
-    "cross-env": "^5.1.4",
     "eslint": "^4.1.1",
     "eslint-config-react-tools": "^1.0.10",
     "eslint-plugin-class-property": "^1.0.6",
@@ -70,9 +67,9 @@
     "npm-run-all": "^4.1.2",
     "onchange": "^3.0.2",
     "postcss-cli": "^2.6.0",
-    "prop-types": "^15.7.2",
-    "react": "^16.3.2",
-    "react-dom": "^16.3.2",
+    "prop-types": "^15.6.0",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2",
     "react-json-tree": "^0.10.9",
     "rimraf": "^2.6.1",
     "rollup": "^0.55.3",

src/defaultProps.js

@@ -9,14 +9,12 @@ const emptyObj = () => ({})
 export default {
   // General
   data: [],
-  resolveData: data => data,
   loading: false,
   showPagination: true,
   showPaginationTop: false,
   showPaginationBottom: true,
   showPageSizeOptions: true,
   pageSizeOptions: [5, 10, 20, 25, 50, 100],
-  defaultPage: 0,
   defaultPageSize: 20,
   showPageJump: true,
   collapseOnSortingChange: true,
@@ -128,14 +126,12 @@ export default {
     PivotValue: undefined,
     Expander: undefined,
     Filter: undefined,
-    Placeholder: undefined,
     // All Columns
     sortable: undefined, // use table default
     resizable: undefined, // use table default
     filterable: undefined, // use table default
     show: true,
     minWidth: 100,
-    minResizeWidth: 11,
     // Cells only
     className: '',
     style: {},
@@ -175,8 +171,6 @@ export default {
   pageText: 'Page',
   ofText: 'of',
   rowsText: 'rows',
-  pageJumpText: 'jump to page',
-  rowsSelectorText: 'rows per page',
 
   // Components
   TableComponent: ({ children, className, ...rest }) => (
@@ -223,13 +217,12 @@ export default {
     </div>
   ),
   TfootComponent: _.makeTemplateComponent('rt-tfoot', 'Tfoot'),
-  FilterComponent: ({ filter, onChange, column }) => (
+  FilterComponent: ({ filter, onChange }) => (
     <input
       type="text"
       style={{
         width: '100%',
       }}
-      placeholder={column.Placeholder}
       value={filter ? filter.value : ''}
       onChange={event => onChange(event.target.value)}
     />

src/hoc/README.md

@@ -0,0 +1,139 @@
+<div style="text-align:center;">
+  <a href="https://github.com/react-tools/react-table" target="\_parent"><img src="https://github.com/react-tools/media/raw/master/logo-react-table.png" alt="React Table Logo" style="width:450px;"/></a>
+</div>
+
+# ReactTable - expanding with HOCs
+
+This documentation is about expanding ReactTable using Higher Order Components/Functions.
+
+## Covered in this README
+
+* A Brief explanation of HOCs and why they are a good approach for ReactTable enhancements
+* Documentation of the currently available HOCs
+* TreeTable
+* SelectTable
+* Documentation of the standard for writing HOCs with ReactTable
+
+## What are HOCs and why use them with ReactTable
+
+HOCs (or Higher Order Components/Functions) are either a React Component (or a function that returns a React Component)
+that are used to enhance the functionality of an existing component. How much you can enhance depends on the props that
+the component exposes.
+
+Fortunately, ReactTable exposes a LOT of functionality as props to the component. In some cases there are too many
+props to keep track of and that is where HOCs come in.
+
+You can write a HOC that just focusses on the additional functionality you want to enhance and keep those enhancements to
+reuse over and over again when you need them. You don't have to edit the ReactSource code, just wrap ReactTable in one or
+more HOCs (more on some issues related to chaining HOCs later) that provide the additional functionality you want to expose.
+
+The most obvious HOC is one that can add `checkbox` or select functionality. The HOC included provides `select` functionality
+that allows the developer to specify if they want a `checkbox` or `radio` style of select column. The implementation of the
+selection is recorded (e.g. in component state, Redux, etc.) and how to manage multiple selections. The HOC really only handles
+the rendering pieces.
+
+But there is more documentation on the `select` HOC below.
+
+## Currently Available HOCs
+
+### TreeTable
+
+TreeTable takes over the rendering of the generated pivot rows of ReactTable so that they appear more like an expandable Tree.
+
+It accomplishes this by rendering a 100% wide div and then only rendering the cell that controls the pivot at that level.
+
+Using it is as simple as doing the following:
+
+```javascript
+import ReactTable from "react-table";
+import treeTableHOC from "react-table/lib/hoc/treeTable";
+
+const TreeTable = treeTableHOC(ReactTable);
+```
+
+After you have done the above, you can then use `TreeTable` just as you would `ReactTable` but it will render pivots using
+the Tree style described above.
+
+### SelectTable
+
+SelectTable is a little trickier. The HOCs attempt to avoid adding additional state and, as there is no internal ID for a row that
+can be relied on to be static (ReactTable just reuses indexes when rendering) the developer has to maintain the state outside of even
+the wrapped component. So it is largely based on callbacks.
+
+You include the HOC in the same manner as you would for the treeTableHOC but then need to provide the following overrides:
+
+* isSelected - returns `true` if the key passed is selected otherwise it should return `false`
+* selectAll - a property that indicates if the selectAll is set (`true|false`)
+* toggleAll - called when the user clicks the `selectAll` checkbox/radio
+* toggleSelection - called when the use clicks a specific checkbox/radio in a row
+* selectType - either `checkbox|radio` to indicate what type of selection is required
+
+**Note:** The select field defaults to the accessor `_id` property in order to render the select field for that particular row. If your objects have different
+unique ID fields, make sure to tell React Table that by passing it the `keyField` property.
+
+```Javascript
+<ReactTable keyField='id' />
+```
+
+In the case of `radio` there is no `selectAll` displayed but the developer is responsible for only making one selection in
+the controlling component's state. You could select multiple but it wouldn't make sense and you should use `checkbox` instead.
+
+You also have to decide what `selectAll` means. Given ReactTable is a paged solution there are other records off-page. When someone
+selects the `selectAll` checkbox, should it mark every possible record, only what might be visible to due a Filter or only those items
+on the current page?
+
+The example opts for the middle approach so it gets a `ref` to the ReactTable instance and pulls the `sortedData` out of the resolved
+state (then walks through those records and pulls their ID into the `selection` state of the controlling component).
+
+You can also replace the input component that is used to render the select box and select all box:
+
+* SelectAllInputComponent - the checkbox in the top left corner
+* SelectInputComponent - the checkbox used on a row
+
+### SelectTreeTable
+
+SelectTreeTable is a combination of TreeTable and SelectTable.
+
+To function correctly the chain has to be in the correct order as follows (see the comments in the guid on HOCs below).
+
+```Javascript
+const SelectTreeTable = selectTableHOC(treeTableHOC(ReactTable));
+```
+
+In this particular instance it is (probably) because the functions need access to the state on the wrapped component to manage
+the selected items. Although that is not totally clearly the issue.
+
+## HOC Guide for ReactTable
+
+There are a few rules required when writing a HOC for ReactTable (other than meeting the normal lint standards - which are
+still being developed).
+
+Firstly, there are issues with `ref` when you write a HOC. Consider a deeply nested component wrapped in multiple HOCs...
+
+A HOC in the middle of the chain requires access to the instance of the component it thinks it is wrapping but there is at
+least one other wrapper in the way. The challenge is: How do I get to the actual wrapped component?
+
+Each HOC is required to be a React Class so that a `ref` can be obtained against each component:
+
+```Javascript
+<Component ... ref={r => this.wrappedInstance = r} />
+```
+
+_NOTE:_ "Component" can also be the `<ReactTable />` instance.
+
+Then the following method needs
+to be placed on the class so that it exposes the correct instance of ReactTable:
+
+```Javascript
+getWrappedInstance() {
+  if (!this.wrappedInstance) console.warn('<component name here> - No wrapped instance')
+  if (this.wrappedInstance.getWrappedInstance) return this.wrappedInstance.getWrappedInstance()
+  else return this.wrappedInstance
+}
+```
+
+Essentially this will walk down the chain (if there are chained HOCs) and stop when it gets to the end and return the wrapped instance.
+
+Finally, sometimes the chains need to be in a specific order to function correctly. It is not clear if this is just an architectural
+issue or if it would be better solved using a library like `recompose`. Anyone who is able to contribute a reliable solution to this
+is welcome to submit a PR.

src/hoc/advancedExpandTable/index.js

@@ -1,199 +0,0 @@
-import React, { Component } from 'react'
-import PropTypes from 'prop-types'
-import set from 'lodash.set'
-import get from 'lodash.get'
-
-/*
-  AvancedExpandTableHOC for ReactTable
-
-  HOC which allows any Cell in the row to toggle the row's
-  SubComponent. Also allows the SubComponent to toggle itself.
-
-  Expand functions available to any SubComponent or Column Cell:
-    toggleRowSubComponent
-    showRowSubComponent
-    hideRowSubComponent
-
-  Each Column Renderer (E.g. Cell ) gets the expand functions in its props
-  And Each SubComponent gets the expand functions in its props
-
-  Expand functions takes the `rowInfo` given to each
-  Column Renderer and SubComponent already by ReactTable.
-*/
-
-export const subComponentWithToggle = (SubComponent, expandFuncs) => props => (
-  <SubComponent {...props} {...expandFuncs} />
-)
-
-// each cell in the column gets passed the function to toggle a sub component
-export const columnsWithToggle = (columns, expandFuncs) =>
-  columns.map(column => {
-    if (column.columns) {
-      return {
-        ...column,
-        columns: columnsWithToggle(column.columns, expandFuncs),
-      }
-    }
-    return {
-      ...column,
-      getProps () {
-        return {
-          ...expandFuncs,
-        }
-      },
-    }
-  })
-
-export const advancedExpandTableHOC = TableComponent =>
-  class AdvancedExpandTable extends Component {
-    constructor (props) {
-      super(props)
-      this.state = {
-        expanded: {},
-      }
-      this.toggleRowSubComponent = this.toggleRowSubComponent.bind(this)
-      this.showRowSubComponent = this.showRowSubComponent.bind(this)
-      this.hideRowSubComponent = this.hideRowSubComponent.bind(this)
-      this.getTdProps = this.getTdProps.bind(this)
-      this.fireOnExpandedChange = this.fireOnExpandedChange.bind(this)
-      this.expandFuncs = {
-        toggleRowSubComponent: this.toggleRowSubComponent,
-        showRowSubComponent: this.showRowSubComponent,
-        hideRowSubComponent: this.hideRowSubComponent,
-      }
-    }
-
-    // after initial render if we get new
-    // data, columns, page changes, etc.
-    // we reset expanded state.
-    UNSAFE_componentWillReceiveProps () {
-      this.setState({
-        expanded: {},
-      })
-    }
-
-    static propTypes = {
-      columns: PropTypes.array.isRequired,
-      SubComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element])
-        .isRequired,
-      onExpandedChange: PropTypes.func,
-    };
-
-    static defaultProps = {
-      onExpandedChange: null,
-    };
-
-    static DisplayName = 'AdvancedExpandTable';
-
-    // since we pass the expand functions to each Cell,
-    // we need to filter it out from being passed as an
-    // actual DOM attribute. See getProps in columnsWithToggle above.
-    static TdComponent ({
-      toggleRowSubComponent,
-      showRowSubComponent,
-      hideRowSubComponent,
-      ...rest
-    }) {
-      return <TableComponent.defaultProps.TdComponent {...rest} />
-    }
-
-    fireOnExpandedChange (rowInfo, e) {
-      // fire callback once state has changed.
-      if (this.props.onExpandedChange) {
-        this.props.onExpandedChange(rowInfo, e)
-      }
-    }
-
-    resolveNewTableState (rowInfoOrNestingPath, e, expandType) {
-      // derive nestingPath if only rowInfo is passed
-      let nestingPath = rowInfoOrNestingPath
-
-      if (rowInfoOrNestingPath.nestingPath) {
-        nestingPath = rowInfoOrNestingPath.nestingPath
-      }
-
-      this.setState(
-        prevState => {
-          const isExpanded = get(prevState.expanded, nestingPath)
-          // since we do not support nested rows, a shallow clone is okay.
-          const newExpanded = { ...prevState.expanded }
-
-          switch (expandType) {
-            case 'show':
-              set(newExpanded, nestingPath, {})
-              break
-            case 'hide':
-              set(newExpanded, nestingPath, false)
-              break
-            default:
-              // toggle
-              set(newExpanded, nestingPath, isExpanded ? false : {})
-          }
-          return {
-            ...prevState,
-            expanded: newExpanded,
-          }
-        },
-        () => this.fireOnExpandedChange(rowInfoOrNestingPath, e)
-      )
-    }
-
-    toggleRowSubComponent (rowInfo, e) {
-      this.resolveNewTableState(rowInfo, e)
-    }
-
-    showRowSubComponent (rowInfo, e) {
-      this.resolveNewTableState(rowInfo, e, 'show')
-    }
-
-    hideRowSubComponent (rowInfo, e) {
-      this.resolveNewTableState(rowInfo, e, 'hide')
-    }
-
-    getTdProps (tableState, rowInfo, column) {
-      const { expander } = column
-
-      if (!expander) {
-        // no overrides
-        return {}
-      }
-
-      return {
-        // only override onClick for column Td
-        onClick: e => {
-          this.toggleRowSubComponent(rowInfo, e)
-        },
-      }
-    }
-
-    getWrappedInstance () {
-      if (!this.wrappedInstance) { console.warn('AdvancedExpandTable - No wrapped instance') }
-      if (this.wrappedInstance.getWrappedInstance) {
-        return this.wrappedInstance.getWrappedInstance()
-      }
-      return this.wrappedInstance
-    }
-
-    render () {
-      const {
-        columns, SubComponent, onExpandedChange, ...rest
-      } = this.props
-
-      const wrappedColumns = columnsWithToggle(columns, this.expandFuncs)
-      const WrappedSubComponent = subComponentWithToggle(
-        SubComponent,
-        this.expandFuncs
-      )
-
-      return (
-        <TableComponent
-          {...rest}
-          columns={wrappedColumns}
-          expanded={this.state.expanded}
-          getTdProps={this.getTdProps}
-          SubComponent={WrappedSubComponent}
-          TdComponent={AdvancedExpandTable.TdComponent}
-        />
-      )
-    }
-  }

src/hoc/foldableTable/index.js

@@ -1,230 +0,0 @@
-/* eslint-disable */
-
-import React from 'react'
-import left from './left.svg'
-import right from './right.svg'
-
-const defaultFoldIconComponent = ({ collapsed }) => {
-  const style = { width: 25 }
-
-  if (collapsed) return <img src={right} style={style} alt="right" />
-  return <img src={left} style={style} alt="left" />
-}
-
-const defaultFoldButtonComponent = ({ header, collapsed, icon, onClick }) => {
-  const style = {
-    marginLeft: '0px',
-    marginTop: '-5px',
-    marginBottom: '-8px',
-    float: 'left',
-    cursor: 'pointer',
-  }
-
-  return (
-    <div>
-      <div style={style} onClick={onClick}>
-        {icon}
-      </div>
-      {!collapsed && <div>{header}</div>}
-    </div>
-  )
-}
-
-export default ReactTable => {
-  const wrapper = class RTFoldableTable extends React.Component {
-    constructor(props, context) {
-      super(props, context)
-
-      this.state = {
-        folded: props.onFoldChange ? undefined : {},
-        resized: props.resized || [],
-      }
-    }
-
-    UNSAFE_componentWillReceiveProps(newProps) {
-      if (this.state.resized !== newProps.resized) {
-        this.setState(p => ({ resized: newProps.resized }))
-      }
-    }
-
-    onResizedChange = resized => {
-      const { onResizedChange } = this.props
-      if (onResizedChange) onResizedChange(resized)
-      else {
-        this.setState(p => ({ resized }))
-      }
-    }
-
-    removeResized = column => {
-      const { id } = column
-      if (!id) return
-
-      const { resized } = this.state
-      if (!resized) return
-
-      const rs = resized.find(r => r.id === id)
-      if (!rs) return
-
-      const newResized = resized.filter(r => r !== rs)
-      this.onResizedChange(newResized)
-    }
-
-    // this is so we can expose the underlying ReactTable.
-    getWrappedInstance = () => {
-      if (!this.wrappedInstance) console.warn('RTFoldableTable - No wrapped instance')
-      if (this.wrappedInstance.getWrappedInstance) return this.wrappedInstance.getWrappedInstance()
-      return this.wrappedInstance
-    }
-
-    getCopiedKey = key => {
-      const { foldableOriginalKey } = this.props
-      return `${foldableOriginalKey}${key}`
-    }
-
-    copyOriginals = column => {
-      const { FoldedColumn } = this.props
-
-      // Stop copy if the column already copied
-      if (column.original_Header) return
-
-      Object.keys(FoldedColumn).forEach(k => {
-        const copiedKey = this.getCopiedKey(k)
-
-        if (k === 'Cell') column[copiedKey] = column[k] ? column[k] : c => c.value
-        else column[copiedKey] = column[k]
-      })
-
-      // Copy sub Columns
-      if (column.columns && !column.original_Columns) column.original_Columns = column.columns
-
-      // Copy Header
-      if (!column.original_Header) column.original_Header = column.Header
-    }
-
-    restoreToOriginal = column => {
-      const { FoldedColumn } = this.props
-
-      Object.keys(FoldedColumn).forEach(k => {
-        // ignore header as handling by foldableHeaderRender
-        if (k === 'Header') return
-
-        const copiedKey = this.getCopiedKey(k)
-        column[k] = column[copiedKey]
-      })
-
-      if (column.columns && column.original_Columns) column.columns = column.original_Columns
-    }
-
-    getState = () => (this.props.onFoldChange ? this.props.folded : this.state.folded)
-
-    isFolded = col => {
-      const folded = this.getState()
-      return folded[col.id] === true
-    }
-
-    foldingHandler = col => {
-      if (!col || !col.id) return
-
-      const { onFoldChange } = this.props
-      const folded = this.getState()
-      const { id } = col
-
-      const newFold = Object.assign({}, folded)
-      newFold[id] = !newFold[id]
-
-      // Remove the Resized if have
-      this.removeResized(col)
-
-      if (onFoldChange) onFoldChange(newFold)
-      else {
-        this.setState(previous => ({ folded: newFold }))
-      }
-    }
-
-    foldableHeaderRender = cell => {
-      const { FoldButtonComponent, FoldIconComponent } = this.props
-      const { column } = cell
-      const collapsed = this.isFolded(column)
-      const icon = React.createElement(FoldIconComponent, { collapsed })
-      const onClick = () => this.foldingHandler(column)
-
-      return React.createElement(FoldButtonComponent, {
-        header: column.original_Header,
-        collapsed,
-        icon,
-        onClick,
-      })
-    }
-
-    applyFoldableForColumn = column => {
-      const collapsed = this.isFolded(column)
-      const { FoldedColumn } = this.props
-
-      // Handle Column Header
-      if (column.columns) {
-        if (collapsed) {
-          column.columns = [FoldedColumn]
-          column.width = FoldedColumn.width
-          column.style = FoldedColumn.style
-        } else this.restoreToOriginal(column)
-      }
-      // Handle Normal Column.
-      else if (collapsed) column = Object.assign(column, FoldedColumn)
-      else {
-        this.restoreToOriginal(column)
-      }
-    }
-
-    applyFoldableForColumns = columns =>
-      columns.map((col, index) => {
-        if (!col.foldable) return col
-
-        // If col don't have id then generate id based on index
-        if (!col.id) col.id = `col_${index}`
-
-        this.copyOriginals(col)
-        // Replace current header with internal header render.
-        col.Header = c => this.foldableHeaderRender(c)
-        // apply foldable
-        this.applyFoldableForColumn(col)
-
-        // return the new column out
-        return col
-      })
-
-    render() {
-      const {
-        columns: originalCols,
-        FoldButtonComponent,
-        FoldIconComponent,
-        FoldedColumn,
-        ...rest
-      } = this.props
-      const columns = this.applyFoldableForColumns([...originalCols])
-
-      const extra = {
-        columns,
-        onResizedChange: this.onResizedChange,
-        resized: this.state.resized,
-      }
-
-      return <ReactTable {...rest} {...extra} ref={r => (this.wrappedInstance = r)} />
-    }
-  }
-
-  wrapper.displayName = 'RTFoldableTable'
-  wrapper.defaultProps = {
-    FoldIconComponent: defaultFoldIconComponent,
-    FoldButtonComponent: defaultFoldButtonComponent,
-    foldableOriginalKey: 'original_',
-    FoldedColumn: {
-      Cell: c => '',
-      width: 30,
-      sortable: false,
-      resizable: false,
-      filterable: false,
-    },
-  }
-
-  return wrapper
-}

src/hoc/foldableTable/left.svg

@@ -1 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'><svg height="512px" id="Layer_1" style="enable-background:new 0 0 512 512;" version="1.1" viewBox="0 0 512 512" width="512px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M327.3,98.9l-2.1,1.8l-156.5,136c-5.3,4.6-8.6,11.5-8.6,19.2c0,7.7,3.4,14.6,8.6,19.2L324.9,411l2.6,2.3  c2.5,1.7,5.5,2.7,8.7,2.7c8.7,0,15.8-7.4,15.8-16.6h0V112.6h0c0-9.2-7.1-16.6-15.8-16.6C332.9,96,329.8,97.1,327.3,98.9z"/></svg>

src/hoc/foldableTable/right.svg

@@ -1 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'><svg height="512px" id="Layer_1" style="enable-background:new 0 0 512 512;" version="1.1" viewBox="0 0 512 512" width="512px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M184.7,413.1l2.1-1.8l156.5-136c5.3-4.6,8.6-11.5,8.6-19.2c0-7.7-3.4-14.6-8.6-19.2L187.1,101l-2.6-2.3  C182,97,179,96,175.8,96c-8.7,0-15.8,7.4-15.8,16.6h0v286.8h0c0,9.2,7.1,16.6,15.8,16.6C179.1,416,182.2,414.9,184.7,413.1z"/></svg>

src/hoc/selectTable/index.js

@@ -6,9 +6,7 @@ const defaultSelectInputComponent = props => {
   return (
     <input
       type={props.selectType || 'checkbox'}
-      aria-label={`${props.checked ? 'Un-select':'Select'} row with id:${props.id}` }
       checked={props.checked}
-      id={props.id}
       onClick={e => {
         const { shiftKey } = e
         e.stopPropagation()
@@ -19,7 +17,7 @@ const defaultSelectInputComponent = props => {
   )
 }
 
-export default (Component, options) => {
+export default Component => {
   const wrapper = class RTSelectTable extends React.Component {
     constructor(props) {
       super(props)
@@ -33,8 +31,8 @@ export default (Component, options) => {
         checked,
         onClick: toggleSelection,
         selectType,
+        id: row[keyField],
         row,
-        id: `select-${row[keyField]}`
       }
       return React.createElement(this.props.SelectInputComponent, inputProps)
     }
@@ -48,7 +46,6 @@ export default (Component, options) => {
         checked,
         onClick: toggleAll,
         selectType,
-        id: 'select-all'
       }
 
       return React.createElement(SelectAllInputComponent, inputProps)
@@ -88,8 +85,7 @@ export default (Component, options) => {
         resizable: false,
         style: { textAlign: 'center' },
       }
-
-      const columns = (options !== undefined && options.floatingLeft === true) ? [...originalCols, select] : [select, ...originalCols]
+      const columns = [select, ...originalCols]
       const extra = {
         columns,
       }
@@ -110,7 +106,7 @@ export default (Component, options) => {
     toggleAll: () => {
       console.log('No toggleAll handler provided.')
     },
-    selectType: 'checkbox',
+    selectType: 'check',
     SelectInputComponent: defaultSelectInputComponent,
     SelectAllInputComponent: defaultSelectInputComponent,
   }

src/hoc/treeTable/index.js

@@ -31,7 +31,7 @@ export default Component => {
         cell.props.style.borderBottom = '1px solid rgba(128,128,128,0.2)'
 
         return (
-          <div className={`rt-tr ${rest.className}`} role="row" style={rest.style}>
+          <div className={`rt-tr ${rest.className}`} style={rest.style}>
             {cell}
           </div>
         )
@@ -49,16 +49,12 @@ export default Component => {
       const extra = {
         columns: columns.map(col => {
           let column = col
-          if (rest.pivotBy && (rest.pivotBy.includes(col.accessor) || rest.pivotBy.includes(col.id))) {
+          if (rest.pivotBy && rest.pivotBy.includes(col.accessor)) {
             column = {
-              id: col.id,
               accessor: col.accessor,
               width: `${treeTableIndent}px`,
               show: false,
               Header: '',
-              Expander: col.Expander,
-              PivotValue: col.PivotValue,
-              Pivot: col.Pivot,
             }
           }
           return column

src/index.js

@@ -34,7 +34,7 @@ export default class ReactTable extends Methods(Lifecycle(Component)) {
     this.resizeColumnMoving = this.resizeColumnMoving.bind(this)
 
     this.state = {
-      page: props.defaultPage,
+      page: 0,
       pageSize: props.defaultPageSize,
       sorted: props.defaultSorted,
       expanded: props.defaultExpanded,
@@ -537,9 +537,7 @@ export default class ReactTable extends Methods(Lifecycle(Component)) {
                   {
                     expanded: newExpanded,
                   },
-                  () =>
-                    onExpandedChange &&
-                    onExpandedChange(newExpanded, cellInfo.nestingPath, e, cellInfo)
+                  () => onExpandedChange && onExpandedChange(newExpanded, cellInfo.nestingPath, e)
                 )
               }
 
@@ -645,7 +643,7 @@ export default class ReactTable extends Methods(Lifecycle(Component)) {
                   key={`${i2}-${column.id}`}
                   className={classnames(
                     classes,
-                    !cellInfo.expandable && !show && 'hidden',
+                    !show && 'hidden',
                     cellInfo.expandable && 'rt-expandable',
                     (isBranch || isPreview) && 'rt-pivot'
                   )}
@@ -667,14 +665,7 @@ export default class ReactTable extends Methods(Lifecycle(Component)) {
           {rowInfo.subRows &&
             isExpanded &&
             rowInfo.subRows.map((d, i) => makePageRow(d, i, rowInfo.nestingPath))}
-          {SubComponent &&
-            !rowInfo.subRows &&
-            isExpanded &&
-            SubComponent(rowInfo, () => {
-              const newExpanded = _.clone(expanded)
-
-              _.set(newExpanded, rowInfo.nestingPath, false)
-            })}
+          {SubComponent && !rowInfo.subRows && isExpanded && SubComponent(rowInfo)}
         </TrGroupComponent>
       )
     }
@@ -717,7 +708,7 @@ export default class ReactTable extends Methods(Lifecycle(Component)) {
       const trGroupProps = getTrGroupProps(finalState, undefined, undefined, this)
       const trProps = _.splitProps(getTrProps(finalState, undefined, undefined, this))
       return (
-        <TrGroupComponent key={`pad-${i}`} {...trGroupProps}>
+        <TrGroupComponent key={i} {...trGroupProps}>
           <TrComponent
             className={classnames(
               '-padRow',
@@ -737,7 +728,7 @@ export default class ReactTable extends Methods(Lifecycle(Component)) {
       const show = typeof column.show === 'function' ? column.show() : column.show
       const width = _.getFirstDefined(resizedCol.value, column.width, column.minWidth)
       const maxWidth = _.getFirstDefined(resizedCol.value, column.width, column.maxWidth)
-      const tFootTdProps = _.splitProps(getTfootTdProps(finalState, undefined, column, this))
+      const tFootTdProps = _.splitProps(getTfootTdProps(finalState, undefined, undefined, this))
       const columnProps = _.splitProps(column.getProps(finalState, undefined, column, this))
       const columnFooterProps = _.splitProps(
         column.getFooterProps(finalState, undefined, column, this)
@@ -780,7 +771,7 @@ export default class ReactTable extends Methods(Lifecycle(Component)) {
     }
 
     const makeColumnFooters = () => {
-      const tFootProps = _.splitProps(getTfootProps(finalState, undefined, undefined, this))
+      const tFootProps = getTfootProps(finalState, undefined, undefined, this)
       const tFootTrProps = _.splitProps(getTfootTrProps(finalState, undefined, undefined, this))
       return (
         <TfootComponent
@@ -802,7 +793,7 @@ export default class ReactTable extends Methods(Lifecycle(Component)) {
       )
     }
 
-    const makePagination = isTop => {
+    const makePagination = () => {
       const paginationProps = _.splitProps(
         getPaginationProps(finalState, undefined, undefined, this)
       )
@@ -816,54 +807,56 @@ export default class ReactTable extends Methods(Lifecycle(Component)) {
           onPageSizeChange={this.onPageSizeChange}
           className={paginationProps.className}
           style={paginationProps.style}
-          isTop={isTop}
           {...paginationProps.rest}
         />
       )
     }
 
-    const makeTable = () => (
-      <div
-        className={classnames('ReactTable', className, rootProps.className)}
-        style={{
-          ...style,
-          ...rootProps.style,
-        }}
-        {...rootProps.rest}
-      >
-        {showPagination && showPaginationTop ? (
-          <div className="pagination-top">{makePagination(true)}</div>
-        ) : null}
-        <TableComponent
-          className={classnames(tableProps.className, currentlyResizing ? 'rt-resizing' : '')}
-          style={tableProps.style}
-          {...tableProps.rest}
+    const makeTable = () => {
+      const pagination = makePagination()
+      return (
+        <div
+          className={classnames('ReactTable', className, rootProps.className)}
+          style={{
+            ...style,
+            ...rootProps.style,
+          }}
+          {...rootProps.rest}
         >
-          {hasHeaderGroups ? makeHeaderGroups() : null}
-          {makeHeaders()}
-          {hasFilters ? makeFilters() : null}
-          <TbodyComponent
-            className={classnames(tBodyProps.className)}
-            style={{
-              ...tBodyProps.style,
-              minWidth: `${rowMinWidth}px`,
-            }}
-            {...tBodyProps.rest}
+          {showPagination && showPaginationTop ? (
+            <div className="pagination-top">{pagination}</div>
+          ) : null}
+          <TableComponent
+            className={classnames(tableProps.className, currentlyResizing ? 'rt-resizing' : '')}
+            style={tableProps.style}
+            {...tableProps.rest}
           >
-            {pageRows.map((d, i) => makePageRow(d, i))}
-            {padRows.map(makePadRow)}
-          </TbodyComponent>
-          {hasColumnFooter ? makeColumnFooters() : null}
-        </TableComponent>
-        {showPagination && showPaginationBottom ? (
-          <div className="pagination-bottom">{makePagination(false)}</div>
-        ) : null}
-        {!pageRows.length && (
-          <NoDataComponent {...noDataProps}>{_.normalizeComponent(noDataText)}</NoDataComponent>
-        )}
-        <LoadingComponent loading={loading} loadingText={loadingText} {...loadingProps} />
-      </div>
-    )
+            {hasHeaderGroups ? makeHeaderGroups() : null}
+            {makeHeaders()}
+            {hasFilters ? makeFilters() : null}
+            <TbodyComponent
+              className={classnames(tBodyProps.className)}
+              style={{
+                ...tBodyProps.style,
+                minWidth: `${rowMinWidth}px`,
+              }}
+              {...tBodyProps.rest}
+            >
+              {pageRows.map((d, i) => makePageRow(d, i))}
+              {padRows.map(makePadRow)}
+            </TbodyComponent>
+            {hasColumnFooter ? makeColumnFooters() : null}
+          </TableComponent>
+          {showPagination && showPaginationBottom ? (
+            <div className="pagination-bottom">{pagination}</div>
+          ) : null}
+          {!pageRows.length && (
+            <NoDataComponent {...noDataProps}>{_.normalizeComponent(noDataText)}</NoDataComponent>
+          )}
+          <LoadingComponent loading={loading} loadingText={loadingText} {...loadingProps} />
+        </div>
+      )
+    }
 
     // childProps are optionally passed to a function-as-a-child
     return children ? children(finalState, makeTable, this) : makeTable()

src/index.styl

@@ -9,7 +9,7 @@ input-select-style()
   font-size: inherit
   border-radius: 3px
   font-weight: normal
-  outline-width: 0
+  outline:none
 
 .ReactTable
   position:relative
@@ -73,9 +73,6 @@ input-select-style()
       &:last-child
         border-right: 0
 
-    .rt-th:focus
-      outline-width: 0
-
     .rt-resizable-header
       overflow: visible
       &:last-child
@@ -230,7 +227,7 @@ input-select-style()
       background: alpha(black, .1)
       transition: all .1s ease
       cursor: pointer
-      outline-width: 0
+      outline:none
 
       &[disabled]
         opacity: .5

src/lifecycle.js

@@ -1,14 +1,14 @@
 export default Base =>
   class extends Base {
-    UNSAFE_componentWillMount () {
-      this.setStateWithData(this.getDataModel(this.getResolvedState(), true))
+    componentWillMount () {
+      this.setStateWithData(this.getDataModel(this.getResolvedState()))
     }
 
     componentDidMount () {
       this.fireFetchData()
     }
 
-    UNSAFE_componentWillReceiveProps (nextProps, nextState) {
+    componentWillReceiveProps (nextProps, nextState) {
       const oldState = this.getResolvedState()
       const newState = this.getResolvedState(nextProps, nextState)
 
@@ -44,7 +44,7 @@ export default Base =>
         oldState.sorted !== newState.sorted ||
         oldState.filtered !== newState.filtered
       ) {
-        this.setStateWithData(this.getDataModel(newState, oldState.data !== newState.data))
+        this.setStateWithData(this.getDataModel(newState))
       }
     }
 
@@ -103,7 +103,7 @@ export default Base =>
         newResolvedState.pages = newResolvedState.manual
           ? newResolvedState.pages
           : Math.ceil(newResolvedState.sortedData.length / newResolvedState.pageSize)
-        newResolvedState.page = newResolvedState.manual ? newResolvedState.page : Math.max(
+        newResolvedState.page = Math.max(
           newResolvedState.page >= newResolvedState.pages
             ? newResolvedState.pages - 1
             : newResolvedState.page,

src/methods.js

@@ -13,12 +13,11 @@ export default Base =>
       return resolvedState
     }
 
-    getDataModel (newState, dataChanged) {
+    getDataModel (newState) {
       const {
         columns,
         pivotBy = [],
         data,
-        resolveData,
         pivotIDKey,
         pivotValKey,
         subRowsKey,
@@ -127,8 +126,8 @@ export default Base =>
 
       visibleColumns = visibleColumns.map(column => {
         if (column.columns) {
-          const visibleSubColumns = column.columns.filter(d =>
-            pivotBy.indexOf(d.id) > -1 ? false : _.getFirstDefined(d.show, true)
+          const visibleSubColumns = column.columns.filter(
+            d => (pivotBy.indexOf(d.id) > -1 ? false : _.getFirstDefined(d.show, true))
           )
           return {
             ...column,
@@ -138,12 +137,13 @@ export default Base =>
         return column
       })
 
-      visibleColumns = visibleColumns.filter(column =>
-        column.columns
-          ? column.columns.length
-          : pivotBy.indexOf(column.id) > -1
-            ? false
-            : _.getFirstDefined(column.show, true)
+      visibleColumns = visibleColumns.filter(
+        column =>
+          column.columns
+            ? column.columns.length
+            : pivotBy.indexOf(column.id) > -1
+              ? false
+              : _.getFirstDefined(column.show, true)
       )
 
       // Find any custom pivot location
@@ -237,16 +237,7 @@ export default Base =>
         }
         return row
       }
-
-      // // If the data hasn't changed, just use the cached data
-      let resolvedData = this.resolvedData
-      // If the data has changed, run the data resolver and cache the result
-      if (!this.resolvedData || dataChanged) {
-        resolvedData = resolveData(data)
-        this.resolvedData = resolvedData
-      }
-      // Use the resolved data
-      resolvedData = resolvedData.map((d, i) => accessRow(d, i))
+      let resolvedData = data.map((d, i) => accessRow(d, i))
 
       // TODO: Make it possible to fabricate nested rows without pivoting
       const aggregatingColumns = allVisibleColumns.filter(d => !d.expander && d.aggregate)
@@ -307,23 +298,22 @@ export default Base =>
         filtered,
         defaultFilterMethod,
         resolvedData,
+        allVisibleColumns,
         allDecoratedColumns,
       } = resolvedState
 
       const sortMethodsByColumnID = {}
 
-      allDecoratedColumns
-        .filter(col => col.sortMethod)
-        .forEach(col => {
-          sortMethodsByColumnID[col.id] = col.sortMethod
-        })
+      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, allDecoratedColumns),
+            this.filterData(resolvedData, filtered, defaultFilterMethod, allVisibleColumns),
             sorted,
             sortMethodsByColumnID
           ),
@@ -331,15 +321,7 @@ export default Base =>
     }
 
     fireFetchData () {
-      // determine the current state, preferring certain state values over props
-      const currentState = {
-        ...this.getResolvedState(),
-        page: this.getStateOrProp('page'),
-        pageSize: this.getStateOrProp('pageSize'),
-        filtered: this.getStateOrProp('filtered'),
-      }
-
-      this.props.onFetchData(currentState, this)
+      this.props.onFetchData(this.getResolvedState(), this)
     }
 
     getPropOrState (key) {
@@ -624,15 +606,8 @@ export default Base =>
 
     resizeColumnMoving (event) {
       event.stopPropagation()
-      const { onResizedChange, column } = this.props
-      const { resized, currentlyResizing, columns } = this.getResolvedState()
-      const currentColumn = columns.find(
-        c => c.accessor === currentlyResizing.id || c.id === currentlyResizing.id
-      )
-      const minResizeWidth =
-        currentColumn && currentColumn.minResizeWidth != null
-          ? currentColumn.minResizeWidth
-          : column.minResizeWidth
+      const { onResizedChange } = this.props
+      const { resized, currentlyResizing } = this.getResolvedState()
 
       // Delete old value
       const newResized = resized.filter(x => x.id !== currentlyResizing.id)
@@ -645,9 +620,11 @@ export default Base =>
         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,
-        minResizeWidth
+        11
       )
 
       newResized.push({

src/pagination.js

@@ -1,5 +1,7 @@
 import React, { Component } from 'react'
 import classnames from 'classnames'
+//
+// import _ from './utils'
 
 const defaultButton = props => (
   <button type="button" {...props} className="-btn">
@@ -8,51 +10,8 @@ const defaultButton = props => (
 )
 
 export default class ReactTablePagination extends Component {
-  static defaultProps = {
-    PreviousComponent: defaultButton,
-    NextComponent: defaultButton,
-    renderPageJump: ({
-      onChange, value, onBlur, onKeyPress, inputType, pageJumpText,
-    }) => (
-      <div className="-pageJump">
-        <input
-          aria-label={pageJumpText}
-          type={inputType}
-          onChange={onChange}
-          value={value}
-          onBlur={onBlur}
-          onKeyPress={onKeyPress}
-        />
-      </div>
-    ),
-    renderCurrentPage: page => <span className="-currentPage">{page + 1}</span>,
-    renderTotalPagesCount: pages => <span className="-totalPages">{pages || 1}</span>,
-    renderPageSizeOptions: ({
-      pageSize,
-      pageSizeOptions,
-      rowsSelectorText,
-      onPageSizeChange,
-      rowsText,
-    }) => (
-      <span className="select-wrap -pageSizeOptions">
-        <select
-          aria-label={rowsSelectorText}
-          onChange={e => onPageSizeChange(Number(e.target.value))}
-          value={pageSize}
-        >
-          {pageSizeOptions.map((option, i) => (
-            // eslint-disable-next-line react/no-array-index-key
-            <option key={i} value={option}>
-              {`${option} ${rowsText}`}
-            </option>
-          ))}
-        </select>
-      </span>
-    ),
-  }
-
   constructor (props) {
-    super(props)
+    super()
 
     this.getSafePage = this.getSafePage.bind(this)
     this.changePage = this.changePage.bind(this)
@@ -63,10 +22,8 @@ export default class ReactTablePagination extends Component {
     }
   }
 
-  UNSAFE_componentWillReceiveProps (nextProps) {
-    if (this.props.page !== nextProps.page) {
-      this.setState({ page: nextProps.page })
-    }
+  componentWillReceiveProps (nextProps) {
+    this.setState({ page: nextProps.page })
   }
 
   getSafePage (page) {
@@ -92,28 +49,6 @@ export default class ReactTablePagination extends Component {
     this.changePage(page === '' ? this.props.page : page)
   }
 
-  getPageJumpProperties () {
-    return {
-      onKeyPress: e => {
-        if (e.which === 13 || e.keyCode === 13) {
-          this.applyPage()
-        }
-      },
-      onBlur: this.applyPage,
-      value: this.state.page === '' ? '' : this.state.page + 1,
-      onChange: e => {
-        const val = e.target.value
-        const page = val - 1
-        if (val === '') {
-          return this.setState({ page: val })
-        }
-        this.setState({ page: this.getSafePage(page) })
-      },
-      inputType: this.state.page === '' ? 'text' : 'number',
-      pageJumpText: this.props.pageJumpText,
-    }
-  }
-
   render () {
     const {
       // Computed
@@ -128,12 +63,8 @@ export default class ReactTablePagination extends Component {
       canNext,
       onPageSizeChange,
       className,
-      PreviousComponent,
-      NextComponent,
-      renderPageJump,
-      renderCurrentPage,
-      renderTotalPagesCount,
-      renderPageSizeOptions,
+      PreviousComponent = defaultButton,
+      NextComponent = defaultButton,
     } = this.props
 
     return (
@@ -152,17 +83,44 @@ export default class ReactTablePagination extends Component {
         <div className="-center">
           <span className="-pageInfo">
             {this.props.pageText}{' '}
-            {showPageJump ? renderPageJump(this.getPageJumpProperties()) : renderCurrentPage(page)}{' '}
-            {this.props.ofText} {renderTotalPagesCount(pages)}
+            {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 &&
-            renderPageSizeOptions({
-              pageSize,
-              rowsSelectorText: this.props.rowsSelectorText,
-              pageSizeOptions,
-              onPageSizeChange,
-              rowsText: this.props.rowsText,
-            })}
+          {showPageSizeOptions && (
+            <span className="select-wrap -pageSizeOptions">
+              <select onChange={e => onPageSizeChange(Number(e.target.value))} value={pageSize}>
+                {pageSizeOptions.map((option, i) => (
+                  // eslint-disable-next-line react/no-array-index-key
+                  <option key={i} value={option}>
+                    {option} {this.props.rowsText}
+                  </option>
+                ))}
+              </select>
+            </span>
+          )}
         </div>
         <div className="-next">
           <NextComponent

src/propTypes.js

@@ -2,7 +2,7 @@ import PropTypes from 'prop-types'
 
 export default {
   // General
-  data: PropTypes.any,
+  data: PropTypes.array,
   loading: PropTypes.bool,
   showPagination: PropTypes.bool,
   showPaginationTop: PropTypes.bool,
@@ -97,7 +97,6 @@ export default {
       filterable: PropTypes.bool, // use table default
       show: PropTypes.bool,
       minWidth: PropTypes.number,
-      minResizeWidth: PropTypes.number,
 
       // Cells only
       className: PropTypes.string,
@@ -115,7 +114,7 @@ export default {
       // Footers only
       footerClassName: PropTypes.string,
       footerStyle: PropTypes.object,
-      getFooterProps: PropTypes.func,
+      getFooterProps: PropTypes.object,
       filterMethod: PropTypes.func,
       filterAll: PropTypes.bool,
       sortMethod: PropTypes.func,
@@ -140,30 +139,28 @@ export default {
   pageText: PropTypes.node,
   ofText: PropTypes.node,
   rowsText: PropTypes.node,
-  pageJumpText: PropTypes.node,
-  rowsSelectorText: PropTypes.node,
 
   // Components
-  TableComponent: PropTypes.elementType,
-  TheadComponent: PropTypes.elementType,
-  TbodyComponent: PropTypes.elementType,
-  TrGroupComponent: PropTypes.elementType,
-  TrComponent: PropTypes.elementType,
-  ThComponent: PropTypes.elementType,
-  TdComponent: PropTypes.elementType,
-  TfootComponent: PropTypes.elementType,
-  FilterComponent: PropTypes.elementType,
-  ExpanderComponent: PropTypes.elementType,
-  PivotValueComponent: PropTypes.elementType,
-  AggregatedComponent: PropTypes.elementType,
+  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]),
   // this is a computed default generated using
-  PivotComponent: PropTypes.elementType,
+  PivotComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
   // the ExpanderComponent and PivotValueComponent at run-time in methods.js
-  PaginationComponent: PropTypes.elementType,
-  PreviousComponent: PropTypes.elementType,
-  NextComponent: PropTypes.elementType,
-  LoadingComponent: PropTypes.elementType,
-  NoDataComponent: PropTypes.elementType,
-  ResizerComponent: PropTypes.elementType,
-  PadRowComponent: PropTypes.elementType,
+  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/utils.js

@@ -205,7 +205,7 @@ function isSortingDesc (d) {
 
 function normalizeComponent (Comp, params = {}, fallback = Comp) {
   return typeof Comp === 'function' ? (
-    isReactComponent(Comp) ? (
+    Object.getPrototypeOf(Comp).isReactComponent ? (
       <Comp {...params} />
     ) : (
       Comp(params)
@@ -214,24 +214,3 @@ function normalizeComponent (Comp, params = {}, fallback = Comp) {
     fallback
   )
 }
-
-function isClassComponent (component) {
-  return !!((
-    typeof component === 'function' &&
-      !!Object.getPrototypeOf(component).isReactComponent
-  ))
-}
-
-function isFunctionComponent (component) {
-  return !!((
-    typeof component === 'function' &&
-      String(component).includes('return React.createElement')
-  ))
-}
-
-function isReactComponent (component) {
-  return !!((
-    isClassComponent(component) ||
-      isFunctionComponent(component)
-  ))
-}

www/_redirects

@@ -1 +0,0 @@
-*   https://github.com/tannerlinsley/react-table

yarn.lock

@@ -144,7 +144,13 @@ ansi-styles@^2.1.0, ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
-ansi-styles@^3.2.0, ansi-styles@^3.2.1:
+ansi-styles@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88"
+  dependencies:
+    color-convert "^1.9.0"
+
+ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
   dependencies:
@@ -242,7 +248,6 @@ arrify@^1.0.0, arrify@~1.0.1:
 asap@~2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
-  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
 
 asn1@~0.2.3:
   version "0.2.3"
@@ -384,13 +389,13 @@ babel-generator@^6.22.0:
     lodash "^4.2.0"
     source-map "^0.5.0"
 
-babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664"
+babel-helper-builder-binary-assignment-operator-visitor@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.22.0.tgz#29df56be144d81bdeac08262bfa41d2c5e91cdcd"
   dependencies:
-    babel-helper-explode-assignable-expression "^6.24.1"
+    babel-helper-explode-assignable-expression "^6.22.0"
     babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
+    babel-types "^6.22.0"
 
 babel-helper-builder-react-jsx@^6.24.1:
   version "6.26.0"
@@ -418,13 +423,23 @@ babel-helper-define-map@^6.24.1:
     babel-types "^6.26.0"
     lodash "^4.17.4"
 
-babel-helper-explode-assignable-expression@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa"
+babel-helper-explode-assignable-expression@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.22.0.tgz#c97bf76eed3e0bae4048121f2b9dae1a4e7d0478"
   dependencies:
     babel-runtime "^6.22.0"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
+    babel-traverse "^6.22.0"
+    babel-types "^6.22.0"
+
+babel-helper-function-name@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.22.0.tgz#51f1bdc4bb89b15f57a9b249f33d742816dcbefc"
+  dependencies:
+    babel-helper-get-function-arity "^6.22.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.22.0"
+    babel-traverse "^6.22.0"
+    babel-types "^6.22.0"
 
 babel-helper-function-name@^6.24.1:
   version "6.24.1"
@@ -436,6 +451,13 @@ babel-helper-function-name@^6.24.1:
     babel-traverse "^6.24.1"
     babel-types "^6.24.1"
 
+babel-helper-get-function-arity@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.22.0.tgz#0beb464ad69dc7347410ac6ade9f03a50634f5ce"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.22.0"
+
 babel-helper-get-function-arity@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d"
@@ -465,15 +487,15 @@ babel-helper-regex@^6.24.1:
     babel-types "^6.26.0"
     lodash "^4.17.4"
 
-babel-helper-remap-async-to-generator@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b"
+babel-helper-remap-async-to-generator@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.22.0.tgz#2186ae73278ed03b8b15ced089609da981053383"
   dependencies:
-    babel-helper-function-name "^6.24.1"
+    babel-helper-function-name "^6.22.0"
     babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
+    babel-template "^6.22.0"
+    babel-traverse "^6.22.0"
+    babel-types "^6.22.0"
 
 babel-helper-replace-supers@^6.24.1:
   version "6.24.1"
@@ -493,7 +515,13 @@ babel-helpers@^6.22.0:
     babel-runtime "^6.22.0"
     babel-template "^6.22.0"
 
-babel-messages@^6.22.0, babel-messages@^6.23.0:
+babel-messages@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.22.0.tgz#36066a214f1217e4ed4164867669ecb39e3ea575"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-messages@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
   dependencies:
@@ -540,10 +568,10 @@ babel-plugin-syntax-trailing-function-commas@^6.22.0:
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
 
 babel-plugin-transform-async-to-generator@^6.22.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.22.0.tgz#194b6938ec195ad36efc4c33a971acf00d8cd35e"
   dependencies:
-    babel-helper-remap-async-to-generator "^6.24.1"
+    babel-helper-remap-async-to-generator "^6.22.0"
     babel-plugin-syntax-async-functions "^6.8.0"
     babel-runtime "^6.22.0"
 
@@ -632,7 +660,15 @@ babel-plugin-transform-es2015-literals@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.1:
+babel-plugin-transform-es2015-modules-amd@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.22.0.tgz#bf69cd34889a41c33d90dfb740e0091ccff52f21"
+  dependencies:
+    babel-plugin-transform-es2015-modules-commonjs "^6.22.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.22.0"
+
+babel-plugin-transform-es2015-modules-amd@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154"
   dependencies:
@@ -640,9 +676,18 @@ babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
+babel-plugin-transform-es2015-modules-commonjs@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.22.0.tgz#6ca04e22b8e214fb50169730657e7a07dc941145"
+  dependencies:
+    babel-plugin-transform-strict-mode "^6.22.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.22.0"
+    babel-types "^6.22.0"
+
 babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
-  version "6.26.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3"
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz#0d8394029b7dc6abe1a97ef181e00758dd2e5d8a"
   dependencies:
     babel-plugin-transform-strict-mode "^6.24.1"
     babel-runtime "^6.26.0"
@@ -725,10 +770,10 @@ babel-plugin-transform-es2015-unicode-regex@^6.22.0:
     regexpu-core "^2.0.0"
 
 babel-plugin-transform-exponentiation-operator@^6.22.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.22.0.tgz#d57c8335281918e54ef053118ce6eb108468084d"
   dependencies:
-    babel-helper-builder-binary-assignment-operator-visitor "^6.24.1"
+    babel-helper-builder-binary-assignment-operator-visitor "^6.22.0"
     babel-plugin-syntax-exponentiation-operator "^6.8.0"
     babel-runtime "^6.22.0"
 
@@ -780,6 +825,13 @@ babel-plugin-transform-regenerator@^6.22.0:
   dependencies:
     regenerator-transform "^0.10.0"
 
+babel-plugin-transform-strict-mode@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.22.0.tgz#e008df01340fdc87e959da65991b7e05970c8c7c"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.22.0"
+
 babel-plugin-transform-strict-mode@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
@@ -796,8 +848,8 @@ babel-polyfill@^6.9.0:
     regenerator-runtime "^0.10.0"
 
 babel-preset-env@^1.6.1:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.7.0.tgz#dea79fa4ebeb883cd35dab07e260c1c9c04df77a"
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.6.1.tgz#a18b564cc9b9afdf4aae57ae3c1b0d99188e6f48"
   dependencies:
     babel-plugin-check-es2015-constants "^6.22.0"
     babel-plugin-syntax-trailing-function-commas "^6.22.0"
@@ -826,7 +878,7 @@ babel-preset-env@^1.6.1:
     babel-plugin-transform-es2015-unicode-regex "^6.22.0"
     babel-plugin-transform-exponentiation-operator "^6.22.0"
     babel-plugin-transform-regenerator "^6.22.0"
-    browserslist "^3.2.6"
+    browserslist "^2.1.2"
     invariant "^2.2.2"
     semver "^5.3.0"
 
@@ -859,21 +911,31 @@ babel-register@^6.14.0, babel-register@^6.22.0:
     mkdirp "^0.5.1"
     source-map-support "^0.4.2"
 
-babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
-  dependencies:
-    core-js "^2.4.0"
-    regenerator-runtime "^0.11.0"
-
-babel-runtime@^6.6.1, babel-runtime@^6.9.0:
+babel-runtime@^6.18.0, babel-runtime@^6.6.1, babel-runtime@^6.9.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.22.0.tgz#1cf8b4ac67c77a4ddb0db2ae1f74de52ac4ca611"
   dependencies:
     core-js "^2.4.0"
     regenerator-runtime "^0.10.0"
 
-babel-template@^6.22.0, babel-template@^6.24.1, babel-template@^6.26.0:
+babel-runtime@^6.22.0, babel-runtime@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  dependencies:
+    core-js "^2.4.0"
+    regenerator-runtime "^0.11.0"
+
+babel-template@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.22.0.tgz#403d110905a4626b317a2a1fcb8f3b73204b2edb"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.22.0"
+    babel-types "^6.22.0"
+    babylon "^6.11.0"
+    lodash "^4.2.0"
+
+babel-template@^6.24.1, babel-template@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
   dependencies:
@@ -883,7 +945,7 @@ babel-template@^6.22.0, babel-template@^6.24.1, babel-template@^6.26.0:
     babylon "^6.18.0"
     lodash "^4.17.4"
 
-babel-traverse@^6.0.20, babel-traverse@^6.22.1:
+babel-traverse@^6.0.20, babel-traverse@^6.22.0, babel-traverse@^6.22.1:
   version "6.22.1"
   resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.22.1.tgz#3b95cd6b7427d6f1f757704908f2fc9748a5f59f"
   dependencies:
@@ -911,7 +973,7 @@ babel-traverse@^6.24.1, babel-traverse@^6.26.0:
     invariant "^2.2.2"
     lodash "^4.17.4"
 
-babel-types@^6.0.19:
+babel-types@^6.0.19, babel-types@^6.19.0, babel-types@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.22.0.tgz#2a447e8d0ea25d2512409e4175479fd78cc8b1db"
   dependencies:
@@ -920,7 +982,7 @@ babel-types@^6.0.19:
     lodash "^4.2.0"
     to-fast-properties "^1.0.1"
 
-babel-types@^6.19.0, babel-types@^6.22.0, babel-types@^6.24.1, babel-types@^6.26.0:
+babel-types@^6.24.1, babel-types@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
   dependencies:
@@ -933,11 +995,11 @@ babylon@7.0.0-beta.44:
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.44.tgz#89159e15e6e30c5096e22d738d8c0af8a0e8ca1d"
 
-babylon@^6.0.18:
+babylon@^6.0.18, babylon@^6.11.0, babylon@^6.15.0:
   version "6.15.0"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.15.0.tgz#ba65cfa1a80e1759b0e89fb562e27dccae70348e"
 
-babylon@^6.11.0, babylon@^6.15.0, babylon@^6.18.0:
+babylon@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
 
@@ -1008,12 +1070,12 @@ browserslist@^1.7.6:
     caniuse-db "^1.0.30000639"
     electron-to-chromium "^1.2.7"
 
-browserslist@^3.2.6:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.7.tgz#aa488634d320b55e88bab0256184dbbcca1e6de9"
+browserslist@^2.1.2:
+  version "2.11.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2"
   dependencies:
-    caniuse-lite "^1.0.30000835"
-    electron-to-chromium "^1.3.45"
+    caniuse-lite "^1.0.30000792"
+    electron-to-chromium "^1.3.30"
 
 buffer-from@^1.0.0:
   version "1.0.0"
@@ -1056,9 +1118,9 @@ caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
   version "1.0.30000746"
   resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000746.tgz#501098c66f5fbbf634c02f25508b05e8809910f4"
 
-caniuse-lite@^1.0.30000835:
-  version "1.0.30000843"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000843.tgz#4fdec258dc641c385744cdd49d23c5459c3d4411"
+caniuse-lite@^1.0.30000792:
+  version "1.0.30000803"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000803.tgz#9939c37149d38d5f4540430490d240c03106a0f5"
 
 caseless@~0.11.0:
   version "0.11.0"
@@ -1088,7 +1150,7 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0:
+chalk@^2.0.0, chalk@^2.1.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.0.tgz#a060a297a6b57e15b61ca63ce84995daa0fe6e52"
   dependencies:
@@ -1096,14 +1158,6 @@ chalk@^2.0.0:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^2.1.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
 chardet@^0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
@@ -1236,22 +1290,22 @@ convert-source-map@^1.1.0:
 core-js@^1.0.0:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
-  integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=
 
 core-js@^2.4.0:
-  version "2.5.6"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.6.tgz#0fe6d45bf3cac3ac364a9d72de7576f4eb221b9d"
+  version "2.5.5"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.5.tgz#b14dde936c640c0579a6b50cabcc132dd6127e3b"
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
-cross-env@^5.1.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.1.4.tgz#f61c14291f7cc653bb86457002ea80a04699d022"
+create-react-class@^15.6.0:
+  version "15.6.2"
+  resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.2.tgz#cf1ed15f12aad7f14ef5f2dfe05e6c42f91ef02a"
   dependencies:
-    cross-spawn "^5.1.0"
-    is-windows "^1.0.0"
+    fbjs "^0.8.9"
+    loose-envify "^1.3.1"
+    object-assign "^4.1.1"
 
 cross-spawn@^5.1.0, cross-spawn@~5.1.0:
   version "5.1.0"
@@ -1261,16 +1315,6 @@ cross-spawn@^5.1.0, cross-spawn@~5.1.0:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^6.0.4:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
 cryptiles@2.x.x:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
@@ -1307,7 +1351,7 @@ debug-log@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f"
 
-debug@*:
+debug@*, debug@^2.2.0:
   version "2.6.8"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
   dependencies:
@@ -1319,7 +1363,7 @@ debug@2.2.0:
   dependencies:
     ms "0.7.1"
 
-debug@^2.1.1, debug@^2.2.0, debug@^2.6.8, debug@^2.6.9:
+debug@^2.1.1, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
@@ -1422,9 +1466,9 @@ electron-to-chromium@^1.2.7:
   version "1.3.26"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.26.tgz#996427294861a74d9c7c82b9260ea301e8c02d66"
 
-electron-to-chromium@^1.3.45:
-  version "1.3.47"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.47.tgz#764e887ca9104d01a0ac8eabee7dfc0e2ce14104"
+electron-to-chromium@^1.3.30:
+  version "1.3.32"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.32.tgz#11d0684c0840e003c4be8928f8ac5f35dbc2b4e6"
 
 emoji-regex@^6.1.0:
   version "6.5.1"
@@ -1433,7 +1477,6 @@ emoji-regex@^6.1.0:
 encoding@^0.1.11:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
-  integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=
   dependencies:
     iconv-lite "~0.4.13"
 
@@ -1443,7 +1486,16 @@ error-ex@^1.2.0, error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.4.3, es-abstract@^1.7.0:
+es-abstract@^1.4.3:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.7.0.tgz#dfade774e01bfcd97f96180298c449c8623fb94c"
+  dependencies:
+    es-to-primitive "^1.1.1"
+    function-bind "^1.1.0"
+    is-callable "^1.1.3"
+    is-regex "^1.0.3"
+
+es-abstract@^1.7.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.11.0.tgz#cce87d518f0496893b1a30cd8461835535480681"
   dependencies:
@@ -1598,22 +1650,7 @@ eslint-plugin-class-property@^1.0.6:
   dependencies:
     eslint "^3.19.0"
 
-eslint-plugin-import@^2.7.0:
-  version "2.12.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.12.0.tgz#dad31781292d6664b25317fd049d2e2b2f02205d"
-  dependencies:
-    contains-path "^0.1.0"
-    debug "^2.6.8"
-    doctrine "1.5.0"
-    eslint-import-resolver-node "^0.3.1"
-    eslint-module-utils "^2.2.0"
-    has "^1.0.1"
-    lodash "^4.17.4"
-    minimatch "^3.0.3"
-    read-pkg-up "^2.0.0"
-    resolve "^1.6.0"
-
-eslint-plugin-import@^2.9.0:
+eslint-plugin-import@^2.7.0, eslint-plugin-import@^2.9.0:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.11.0.tgz#15aeea37a67499d848e8e981806d4627b5503816"
   dependencies:
@@ -1669,16 +1706,7 @@ eslint-plugin-promise@~3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.5.0.tgz#78fbb6ffe047201627569e85a6c5373af2a68fca"
 
-eslint-plugin-react@^7.4.0:
-  version "7.8.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.8.2.tgz#e95c9c47fece55d2303d1a67c9d01b930b88a51d"
-  dependencies:
-    doctrine "^2.0.2"
-    has "^1.0.1"
-    jsx-ast-utils "^2.0.1"
-    prop-types "^15.6.0"
-
-eslint-plugin-react@^7.7.0:
+eslint-plugin-react@^7.4.0, eslint-plugin-react@^7.7.0:
   version "7.7.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.7.0.tgz#f606c719dbd8a1a2b3d25c16299813878cca0160"
   dependencies:
@@ -1851,7 +1879,7 @@ event-emitter@~0.3.5:
 
 event-stream@~3.3.0:
   version "3.3.4"
-  resolved "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"
+  resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"
   dependencies:
     duplexer "~0.1.1"
     from "~0"
@@ -1916,9 +1944,8 @@ fast-levenshtein@~2.0.4:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
 
 fbjs@^0.8.16:
-  version "0.8.17"
-  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd"
-  integrity sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=
+  version "0.8.16"
+  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
   dependencies:
     core-js "^1.0.0"
     isomorphic-fetch "^2.1.1"
@@ -1926,7 +1953,7 @@ fbjs@^0.8.16:
     object-assign "^4.1.0"
     promise "^7.1.1"
     setimmediate "^1.0.5"
-    ua-parser-js "^0.7.18"
+    ua-parser-js "^0.7.9"
 
 fbjs@^0.8.9:
   version "0.8.12"
@@ -2036,8 +2063,8 @@ form-data@~2.1.1:
     mime-types "^2.1.12"
 
 from@~0:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/from/-/from-0.1.3.tgz#ef63ac2062ac32acf7862e0d40b44b896f22f3bc"
 
 fs-readdir-recursive@^0.1.0:
   version "0.1.2"
@@ -2297,19 +2324,12 @@ http-signature@~1.1.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-iconv-lite@^0.4.17:
+iconv-lite@^0.4.17, iconv-lite@~0.4.13:
   version "0.4.21"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.21.tgz#c47f8733d02171189ebc4a400f3218d348094798"
   dependencies:
     safer-buffer "^2.1.0"
 
-iconv-lite@~0.4.13:
-  version "0.4.24"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
-  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3"
-
 ignore@^3.0.11, ignore@^3.0.9:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.3.tgz#432352e57accd87ab3110e82d3fea0e47812156d"
@@ -2384,7 +2404,13 @@ interpret@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
 
-invariant@^2.2.0, invariant@^2.2.2:
+invariant@^2.2.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
+  dependencies:
+    loose-envify "^1.0.0"
+
+invariant@^2.2.2:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   dependencies:
@@ -2524,7 +2550,7 @@ is-property@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
 
-is-regex@^1.0.4:
+is-regex@^1.0.3, is-regex@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
   dependencies:
@@ -2537,7 +2563,6 @@ is-resolvable@^1.0.0:
 is-stream@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
 is-symbol@^1.0.1:
   version "1.0.1"
@@ -2551,10 +2576,6 @@ is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
 
-is-windows@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -2572,7 +2593,6 @@ isobject@^2.0.0:
 isomorphic-fetch@^2.1.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
-  integrity sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=
   dependencies:
     node-fetch "^1.0.1"
     whatwg-fetch ">=0.10.0"
@@ -2589,11 +2609,6 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
-"js-tokens@^3.0.0 || ^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
-  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-
 js-yaml@^3.5.1, js-yaml@^3.9.1:
   version "3.11.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef"
@@ -2618,8 +2633,8 @@ jsesc@~0.5.0:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
 
 json-parse-better-errors@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz#50183cd1b2d25275de069e9e71b467ac9eab973a"
 
 json-schema-traverse@^0.3.0:
   version "0.3.1"
@@ -2754,13 +2769,13 @@ lodash.pickby@^4.0.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.pickby/-/lodash.pickby-4.6.0.tgz#7dea21d8c18d7703a27c704c15d3b84a67e33aff"
 
-lodash@^4.0.0, lodash@^4.3.0:
+lodash@^4.0.0, lodash@^4.17.4, lodash@^4.3.0:
   version "4.17.5"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
 
-lodash@^4.17.4, lodash@^4.2.0:
-  version "4.17.10"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
+lodash@^4.2.0:
+  version "4.17.4"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
 log-symbols@^1.0.2:
   version "1.0.2"
@@ -2768,14 +2783,7 @@ log-symbols@^1.0.2:
   dependencies:
     chalk "^1.0.0"
 
-loose-envify@^1.0.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
-  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
-  dependencies:
-    js-tokens "^3.0.0 || ^4.0.0"
-
-loose-envify@^1.1.0:
+loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
   dependencies:
@@ -2789,8 +2797,8 @@ loud-rejection@^1.0.0:
     signal-exit "^3.0.0"
 
 lru-cache@^4.0.1:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.2.tgz#45234b2e6e2f2b33da125624c4664929a0224c3f"
   dependencies:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
@@ -2925,14 +2933,9 @@ next-tick@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
 
-nice-try@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.4.tgz#d93962f6c52f2c1558c0fbda6d512819f1efe1c4"
-
 node-fetch@^1.0.1:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
-  integrity sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==
   dependencies:
     encoding "^0.1.11"
     is-stream "^1.0.1"
@@ -2989,12 +2992,12 @@ normalize-range@^0.1.2:
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
 
 npm-run-all@^4.1.2:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.3.tgz#49f15b55a66bb4101664ce270cb18e7103f8f185"
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.2.tgz#90d62d078792d20669139e718621186656cea056"
   dependencies:
     ansi-styles "^3.2.0"
     chalk "^2.1.0"
-    cross-spawn "^6.0.4"
+    cross-spawn "^5.1.0"
     memorystream "^0.3.1"
     minimatch "^3.0.4"
     ps-tree "^1.1.0"
@@ -3172,10 +3175,6 @@ path-is-inside@^1.0.1, path-is-inside@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
 
-path-key@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-
 path-parse@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
@@ -3308,8 +3307,8 @@ preserve@^0.2.0:
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
 private@^0.1.6:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/private/-/private-0.1.6.tgz#55c6a976d0f9bafb9924851350fe47b9b5fbb7c1"
 
 process-nextick-args@~2.0.0:
   version "2.0.0"
@@ -3326,10 +3325,17 @@ progress@^2.0.0:
 promise@^7.1.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
-  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
   dependencies:
     asap "~2.0.3"
 
+prop-types@^15.5.10, prop-types@^15.6.0:
+  version "15.6.1"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca"
+  dependencies:
+    fbjs "^0.8.16"
+    loose-envify "^1.3.1"
+    object-assign "^4.1.1"
+
 prop-types@^15.5.8:
   version "15.5.10"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154"
@@ -3337,15 +3343,6 @@ prop-types@^15.5.8:
     fbjs "^0.8.9"
     loose-envify "^1.3.1"
 
-prop-types@^15.6.0, prop-types@^15.7.2:
-  version "15.7.2"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
-  integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
-  dependencies:
-    loose-envify "^1.4.0"
-    object-assign "^4.1.1"
-    react-is "^16.8.1"
-
 ps-tree@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/ps-tree/-/ps-tree-1.1.0.tgz#b421b24140d6203f1ed3c76996b4427b08e8c014"
@@ -3397,19 +3394,14 @@ react-base16-styling@^0.5.1:
     lodash.flow "^3.3.0"
     pure-color "^1.2.0"
 
-react-dom@^16.3.2:
-  version "16.4.1"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.4.1.tgz#7f8b0223b3a5fbe205116c56deb85de32685dad6"
+react-dom@^15.4.2:
+  version "15.6.2"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730"
   dependencies:
-    fbjs "^0.8.16"
+    fbjs "^0.8.9"
     loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    prop-types "^15.6.0"
-
-react-is@^16.8.1:
-  version "16.8.6"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"
-  integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==
+    object-assign "^4.1.0"
+    prop-types "^15.5.10"
 
 react-json-tree@^0.10.9:
   version "0.10.9"
@@ -3419,14 +3411,15 @@ react-json-tree@^0.10.9:
     prop-types "^15.5.8"
     react-base16-styling "^0.5.1"
 
-react@^16.3.2:
-  version "16.3.2"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.3.2.tgz#fdc8420398533a1e58872f59091b272ce2f91ea9"
+react@^15.4.2:
+  version "15.6.2"
+  resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72"
   dependencies:
-    fbjs "^0.8.16"
+    create-react-class "^15.6.0"
+    fbjs "^0.8.9"
     loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    prop-types "^15.6.0"
+    object-assign "^4.1.0"
+    prop-types "^15.5.10"
 
 read-file-stdin@^0.2.0:
   version "0.2.1"
@@ -3515,8 +3508,8 @@ redent@^1.0.0:
     strip-indent "^1.0.1"
 
 regenerate@^1.2.1:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260"
 
 regenerator-runtime@^0.10.0:
   version "0.10.5"
@@ -3682,8 +3675,8 @@ rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.6.1:
     glob "^7.0.5"
 
 rollup-plugin-babel@^3.0.3:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-babel/-/rollup-plugin-babel-3.0.4.tgz#41b3e762fe64450dd61da3105a2cf7ad76be4edc"
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-babel/-/rollup-plugin-babel-3.0.3.tgz#63adedc863130327512a4a9006efc2241c5b7c15"
   dependencies:
     rollup-pluginutils "^1.5.0"
 
@@ -3771,10 +3764,9 @@ safe-buffer@^5.0.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
-"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.1.0:
+safer-buffer@^2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
 sax@0.5.x:
   version "0.5.8"
@@ -3790,7 +3782,7 @@ semver-truncate@^1.0.0:
   dependencies:
     semver "^5.3.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
@@ -3813,7 +3805,6 @@ set-immediate-shim@^1.0.1:
 setimmediate@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
 
 shebang-command@^1.2.0:
   version "1.2.0"
@@ -4110,7 +4101,11 @@ tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
-to-fast-properties@^1.0.1, to-fast-properties@^1.0.3:
+to-fast-properties@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.2.tgz#f3f5c0c3ba7299a7ef99427e44633257ade43320"
+
+to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
 
@@ -4160,10 +4155,9 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-ua-parser-js@^0.7.18, ua-parser-js@^0.7.9:
-  version "0.7.20"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.20.tgz#7527178b82f6a62a0f243d1f94fd30e3e3c21098"
-  integrity sha512-8OaIKfzL5cpx8eCMAhhvTlft8GYF8b2eQr6JkCyVdrgjcytyOmPCXrqXFcUnhonRpLlh5yxEZVohm6mzaowUOw==
+ua-parser-js@^0.7.9:
+  version "0.7.17"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac"
 
 uglify-es@^3.3.7:
   version "3.3.9"
@@ -4224,9 +4218,8 @@ vlq@^0.2.2:
   resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"
 
 whatwg-fetch@>=0.10.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb"
-  integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
 
 which-module@^1.0.0:
   version "1.0.0"