From 1b212835a4e3c8ac3006da711d81d9a3aaf32328 Mon Sep 17 00:00:00 2001
From: amoludage <amoludage@joshsoftware.com>
Date: Fri, 25 May 2018 11:36:42 +0530
Subject: [PATCH] fixes sorting issue

  + when remote sort is true then disable client side sorting
---
 .../react-bootstrap-table2/src/sort/wrapper.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/react-bootstrap-table2/src/sort/wrapper.js b/packages/react-bootstrap-table2/src/sort/wrapper.js
index d20d207d6..6d55f1c3d 100644
--- a/packages/react-bootstrap-table2/src/sort/wrapper.js
+++ b/packages/react-bootstrap-table2/src/sort/wrapper.js
@@ -39,15 +39,17 @@ export default Base =>
     }
 
     componentWillReceiveProps(nextProps) {
-      let sortedColumn;
-      for (let i = 0; i < nextProps.columns.length; i += 1) {
-        if (nextProps.columns[i].dataField === nextProps.store.sortField) {
-          sortedColumn = nextProps.columns[i];
-          break;
+      if (!this.isRemoteSort() && !this.isRemotePagination()) {
+        let sortedColumn;
+        for (let i = 0; i < nextProps.columns.length; i += 1) {
+          if (nextProps.columns[i].dataField === nextProps.store.sortField) {
+            sortedColumn = nextProps.columns[i];
+            break;
+          }
+        }
+        if (sortedColumn && sortedColumn.sort) {
+          nextProps.store.sortBy(sortedColumn);
         }
-      }
-      if (sortedColumn && sortedColumn.sort) {
-        nextProps.store.sortBy(sortedColumn);
       }
     }