Fork Update (#7)

* Examples Refactor + multiSort flag (TanStack#619) * chore: Update the devDependencies for the linter * A few HOC examples for react-table. Not really integrated with the whole codesandbox.io approach. * Missing dependency - shortid * Refactor HOCs to /src/hoc Still have to write the HOCReadme.md (still just a placeholder for now) * Refactor complete May need to remove some redundant code * Text change for the HOC samples * Introduced a 'multiSort' flag Defaults to 'true' A 'false' value will turn multi-sort off. * refactor: Fix defaultProps.js linter errors * refactor: Fix lifecycle.js linter errors * refactor: Fix pagination.js linter errors * refactor: Fix propTypes.js linter errors * refactor: Fix utils.js linter errors * refactor: Fix methods.js linter errors * refactor: Fix index.js linter errors * Fix for linter changes + CHANGELOG update * Docs testing cleanup (TanStack#645) * Examples Refactor + multiSort flag (TanStack#619) (#4) * chore: Update the devDependencies for the linter * A few HOC examples for react-table. Not really integrated with the whole codesandbox.io approach. * Missing dependency - shortid * Refactor HOCs to /src/hoc Still have to write the HOCReadme.md (still just a placeholder for now) * Refactor complete May need to remove some redundant code * Text change for the HOC samples * Introduced a 'multiSort' flag Defaults to 'true' A 'false' value will turn multi-sort off. * refactor: Fix defaultProps.js linter errors * refactor: Fix lifecycle.js linter errors * refactor: Fix pagination.js linter errors * refactor: Fix propTypes.js linter errors * refactor: Fix utils.js linter errors * refactor: Fix methods.js linter errors * refactor: Fix index.js linter errors * Fix for linter changes + CHANGELOG update * Examples Refactor + multiSort flag (TanStack#619) (#5) * chore: Update the devDependencies for the linter * A few HOC examples for react-table. Not really integrated with the whole codesandbox.io approach. * Missing dependency - shortid * Refactor HOCs to /src/hoc Still have to write the HOCReadme.md (still just a placeholder for now) * Refactor complete May need to remove some redundant code * Text change for the HOC samples * Introduced a 'multiSort' flag Defaults to 'true' A 'false' value will turn multi-sort off. * refactor: Fix defaultProps.js linter errors * refactor: Fix lifecycle.js linter errors * refactor: Fix pagination.js linter errors * refactor: Fix propTypes.js linter errors * refactor: Fix utils.js linter errors * refactor: Fix methods.js linter errors * refactor: Fix index.js linter errors * Fix for linter changes + CHANGELOG update * Update README.md (TanStack#584) * Update README.md Missing " on Features list, Extra comma removed * Update README.md Added space for component uniformity. * Update the devDependencies for the linter (TanStack#596) * chore: Update the devDependencies for the linter * A few HOC examples for react-table. Not really integrated with the whole codesandbox.io approach. * Missing dependency - shortid * Refactor HOCs to /src/hoc Still have to write the HOCReadme.md (still just a placeholder for now) * Refactor complete May need to remove some redundant code * Text change for the HOC samples * Introduced a 'multiSort' flag Defaults to 'true' A 'false' value will turn multi-sort off. * refactor: Fix defaultProps.js linter errors * refactor: Fix lifecycle.js linter errors * refactor: Fix pagination.js linter errors * refactor: Fix propTypes.js linter errors * refactor: Fix utils.js linter errors * refactor: Fix methods.js linter errors * refactor: Fix index.js linter errors * Fix ThComponent classnames ordering (TanStack#673) Allow for custom classname to overwrite base styles * Add column to getResizerProps (TanStack#667)
Raisemetrex · Dec 12, 2017 · 36a18a5 · 36a18a5
1 parent e102cc5
commit 36a18a5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@
 - Pivoting & Aggregation
 - Minimal design & easily themeable
 - Fully controllable via optional props and callbacks
-- <a href="https://medium.com/@tannerlinsley/why-i-wrote-react-table-and-the-problems-it-has-solved-for-nozzle-others-445c4e93d4a8#.axza4ixba" target="\_parent">"Why I wrote React Table and the problems it has solved for Nozzle.io</a> by Tanner Linsley
+- <a href="https://medium.com/@tannerlinsley/why-i-wrote-react-table-and-the-problems-it-has-solved-for-nozzle-others-445c4e93d4a8#.axza4ixba" target="\_parent">"Why I wrote React Table and the problems it has solved for Nozzle.io"</a> by Tanner Linsley
 
 ## [Demos and examples](http://react-table.js.org/#/story/simple-table)
 
@@ -343,7 +343,7 @@ Or just define them as props
 ```
 
 ## Columns
-`<ReactTable/>` requires a `columns` prop, which is an array of objects containing the following properties
+`<ReactTable />` requires a `columns` prop, which is an array of objects containing the following properties
 
 ```javascript
 [{
@@ -358,7 +358,7 @@ Or just define them as props
   Aggregated: JSX | String | Function // Used to render aggregated cells. Defaults to a comma separated list of values.
   Pivot: JSX | String | Function | cellInfo => ( // Used to render a pivoted cell
     <span>
-      <Expander/><PivotValue /> // By default, will utilize the the PivotValue and Expander components at run time
+      <Expander /><PivotValue /> // By default, will utilize the the PivotValue and Expander components at run time
     </span>
   ),
   PivotValue: JSX | String | Function // Used to render the value inside of a Pivot cell
@@ -480,7 +480,7 @@ If your data has a field/key with a dot (`.`) you will need to supply a custom a
 
 
 ## Column Header Groups
-To group columns with another header column, just nest your columns in a header column.  Header columns utilize the same header properties as regular columns.
+To group columns with another header column, just nest your columns in a header column. Header columns utilize the same header properties as regular columns.
 ```javascript
 const columns = [{
   Header: 'Favorites',
@@ -930,7 +930,7 @@ If you would like to help develop a suggested feature follow these steps:
 - Auto-build files as you edit with `$ yarn run watch`
 - Implement your changes to files in the `src/` directory
 - Run the <a href="https://github.com/tannerlinsley/react-story">React Story</a> locally with `$ yarn run docs`
-- View changes as you edit `docs/src`,
+- View changes as you edit `docs/src`
 - Submit PR for review
 
 #### Scripts

diff --git a/src/defaultProps.js b/src/defaultProps.js
@@ -182,7 +182,7 @@ export default {
   TrComponent: _.makeTemplateComponent('rt-tr', 'Tr'),
   ThComponent: ({ toggleSort, className, children, ...rest }) => (
     <div
-      className={classnames(className, 'rt-th')}
+      className={classnames('rt-th', className)}
       onClick={e => (
         toggleSort && toggleSort(e)
       )}

diff --git a/src/index.js b/src/index.js
@@ -199,7 +199,6 @@ export default class ReactTable extends Methods(Lifecycle(Component)) {
     )
     const loadingProps = getLoadingProps(finalState, undefined, undefined, this)
     const noDataProps = getNoDataProps(finalState, undefined, undefined, this)
-    const resizerProps = getResizerProps(finalState, undefined, undefined, this)
 
     // Visual Components
 
@@ -341,7 +340,7 @@ export default class ReactTable extends Methods(Lifecycle(Component)) {
         ? (<ResizerComponent
           onMouseDown={e => this.resizeColumnStart(e, column, false)}
           onTouchStart={e => this.resizeColumnStart(e, column, true)}
-          {...resizerProps}
+          {...getResizerProps('finalState', undefined, column, this)}
         />)
         : null