From 2e8596618a7d32f45113dbb429d9e30da0163094 Mon Sep 17 00:00:00 2001
From: Gary Menzel <gmenzel@gmail.com>
Date: Thu, 23 Nov 2017 13:53:00 +1100
Subject: [PATCH] Fix for linter changes + CHANGELOG update

---
 CHANGELOG.md | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/index.js |  2 +-
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39d3fa7..41900d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,58 @@
+## 6.7.4
+#### Fixes & Optimizations
+- Fix Prop types for columns
+
+## 6.7.3
+#### Fixes & Optimizations
+- Fix the rest of the proptypes
+
+## 6.7.2
+#### Fixes & Optimizations
+- `getPropTypes` proptype check
+
+## 6.7.1
+#### Fixes & Optimizations
+- `eslint-config` moved to dev deps
+
+## 6.7.0
+## 6.7.0-alpha-0
+#### New Features
+- Expose page/pageSize to rows/cells
+- Supply sort direction to custom sort methods
+
+#### Fixes & Optimizations
+- README updates
+- Linter cleanup
+- Added PropTypes node module
+- Deps, linting and style upgrades
+
+## 6.6.0
+#### Fixes & Optimizations
+- moved repo to react-tools
+- Doc examples moved to codesandbox.io
+- README updates
+- CSS refacting for rt-tfoot to match rt-thead
+- CSS more specific for input and select
+
+## 6.5.3 
+#### Fixes & Optimizations
+- `onClick` proxying and eslint
+
+## 6.5.2
+#### New Features
+- Provide onClick handleOriginal function - #406
+
+#### Fixes & Optimizations
+- README updates
+- `makePathArray` in utils - #326
+- Various fixes: #294, #376, #398, #415, 
+
+## 6.5.1
+#### Fixes & Optimizations
+- `defaultExpanded` now works correctly - #372
+- `column.getProps().rest` props are now applied correctly
+- `makeTemplateComponent` now supports `displayName` - #289
+
 ## 6.5.0
 ##### New Features
 - `column.filterAll` - defaults to `false`, but when set to `true` will provide the entire array of rows to `filterMethod` as opposed to one row at a time. This allows for more fine-grained filtering using any method you can dream up. See the [Custom Filtering example](https://react-table.js.org/#/story/custom-filtering) for more info.
diff --git a/src/index.js b/src/index.js
index b6c0b0b..12d3eed 100644
--- a/src/index.js
+++ b/src/index.js
@@ -367,7 +367,7 @@ export default class ReactTable extends Methods(Lifecycle(Component)) {
             maxWidth: _.asPx(maxWidth),
           }}
           toggleSort={e => {
-            isSortable && this.sortColumn(column, multiSort ? e.shiftKey : false)
+            if (isSortable) this.sortColumn(column, multiSort ? e.shiftKey : false)
           }}
           {...rest}
         >