From fc47d4f258e79d40dc2d3072ed887d4a4aea9cbe Mon Sep 17 00:00:00 2001
From: Gary Menzel <gmenzel@gmail.com>
Date: Thu, 16 Nov 2017 03:05:44 +1100
Subject: [PATCH] Introduced a 'multiSort' flag Defaults to 'true' A 'false'
 value will turn multi-sort off.

---
 README.md                           |  4 +++
 docs/src/App.js                     |  4 +++
 docs/src/examples/expander/index.js | 54 +++++++++++++++++++++++++++++
 src/defaultProps.js                 |  1 +
 src/index.js                        |  3 +-
 5 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 docs/src/examples/expander/index.js

diff --git a/README.md b/README.md
index 7778e92..93ce030 100644
--- a/README.md
+++ b/README.md
@@ -171,6 +171,7 @@ These are all of the available props (and their default values) for the main `<R
   collapseOnDataChange: true,
   freezeWhenExpanded: false,
   sortable: true,
+  multiSort: true,
   resizable: true,
   filterable: false,
   defaultSortDesc: false,
@@ -833,6 +834,9 @@ Sorting comes built in with React-Table.
 ## Multi-Sort
 When clicking on a column header, hold shift to multi-sort! You can toggle `ascending` `descending` and `none` for multi-sort columns. Clicking on a header without holding shift will clear the multi-sort and replace it with the single sort of that column. It's quite handy!
 
+You can set the `multiSort` prop to `false` to disable this feature (which may be useful for server-side sorting when you are not
+going to sort multiple columns).
+
 ## Custom Sorting Algorithm
 To override the default sorting algorithm for the whole table use the `defaultSortMethod` prop.
 
diff --git a/docs/src/App.js b/docs/src/App.js
index fb9ecd4..c8bfcc3 100644
--- a/docs/src/App.js
+++ b/docs/src/App.js
@@ -10,6 +10,8 @@ import '../../react-table.css'
 import Readme from './stories/Readme.js'
 import HOCReadme from './stories/HOCReadme.js'
 
+// import Tester from './examples/expander';
+
 // import { TreeTable, SelectTable, SelectTreeTable } from './examples/index'
 // 
 // const exampleStories = [
@@ -22,6 +24,8 @@ import HOCReadme from './stories/HOCReadme.js'
 const stories = [
   { name: 'Readme', component: Readme },
   { name: 'HOC Readme', component: HOCReadme },
+  
+  // { name: 'Tester', component: Tester },
 
   { name: 'Simple Table', component: CodeSandbox('X6npLXPRW') },
   {
diff --git a/docs/src/examples/expander/index.js b/docs/src/examples/expander/index.js
new file mode 100644
index 0000000..31c08eb
--- /dev/null
+++ b/docs/src/examples/expander/index.js
@@ -0,0 +1,54 @@
+/* eslint-disable */
+
+import React from 'react';
+
+import ReactTable from '../../../../lib/index'
+import '../../../../react-table.css'
+
+const data = [
+  {one:"1.1",two:"1.2"},
+  {one:"2.1",two:"2.2"},
+  {one:"3.1",two:"3.2"},
+  {one:"4.1",two:"4.2"},
+]
+
+const columns = [
+  {accessor:'one', Header: 'One'},
+  {accessor:'two', Header: 'Two'},
+]
+
+class ExpanderComponent extends React.Component {
+  render()
+  {
+    return (
+      <div className={`rt-expander ${this.props.isExpanded ? '-open' : ''}`}>
+        &bull;
+      </div>                
+    )
+  }
+}
+
+class SubComponent extends React.Component {
+  render()
+  {
+    return <div>Nothing</div>
+  }
+}
+
+export default class ComponentTest extends React.Component {
+  render()
+  {
+    const rtProps = {
+      data,
+      columns,
+      ExpanderComponent: (props)=><ExpanderComponent {...props} />,
+      SubComponent: (props)=><SubComponent {...props} />,
+      multiSort: false,
+    }
+    return (
+      <ReactTable 
+        {...rtProps}
+      />
+    )
+  }
+}
diff --git a/src/defaultProps.js b/src/defaultProps.js
index 46f8962..838c7f2 100644
--- a/src/defaultProps.js
+++ b/src/defaultProps.js
@@ -22,6 +22,7 @@ export default {
   collapseOnDataChange: true,
   freezeWhenExpanded: false,
   sortable: true,
+  multiSort: true,
   resizable: true,
   filterable: false,
   defaultSortDesc: false,
diff --git a/src/index.js b/src/index.js
index b3d26f1..03bec8f 100644
--- a/src/index.js
+++ b/src/index.js
@@ -80,6 +80,7 @@ export default class ReactTable extends Methods(Lifecycle(Component)) {
       loadingText,
       noDataText,
       sortable,
+      multiSort,
       resizable,
       filterable,
       // Pivoting State
@@ -382,7 +383,7 @@ export default class ReactTable extends Methods(Lifecycle(Component)) {
             maxWidth: _.asPx(maxWidth),
           }}
           toggleSort={e => {
-            isSortable && this.sortColumn(column, e.shiftKey)
+            isSortable && this.sortColumn(column, multiSort ? e.shiftKey : false)
           }}
           {...rest}
         >