prod

Author: AllenFang

dist/react-bootstrap-table.js

@@ -558,6 +558,14 @@ return /******/ (function(modules) { // webpackBootstrap
 	          sizePerPage: sizePerPage,
 	          reset: false
 	        });
+
+	        if (this.store.isSearching && options.afterSearch) {
+	          options.afterSearch(this.store.searchText, this.store.getDataIgnoringPagination());
+	        }
+
+	        if (this.store.isFiltering && options.afterColumnFilter) {
+	          options.afterColumnFilter(this.store.filterObj, this.store.getDataIgnoringPagination());
+	        }
 	      }
 
 	      // If setting the expanded rows is being handled externally
@@ -809,6 +817,14 @@ return /******/ (function(modules) { // webpackBootstrap
 	        reset: false
 	      });
 	    }
+	  }, {
+	    key: 'cleanSort',
+	    value: function cleanSort() {
+	      this.store.cleanSortInfo();
+	      this.setState({
+	        reset: false
+	      });
+	    }
 	  }, {
 	    key: '__handleSort__REACT_HOT_LOADER__',
 	    value: function __handleSort__REACT_HOT_LOADER__(order, sortField) {
@@ -4193,13 +4209,20 @@ return /******/ (function(modules) { // webpackBootstrap
 	      if (Array.isArray(values)) {
 	        (function () {
 	          // only can use arrray data for options
-	          var rowValue = void 0;
-	          options = values.map(function (d, i) {
-	            rowValue = format ? format(d) : d;
+	          var text = void 0;
+	          var value = void 0;
+	          options = values.map(function (option, i) {
+	            if ((typeof option === 'undefined' ? 'undefined' : _typeof(option)) === 'object') {
+	              text = option.text;
+	              value = option.value;
+	            } else {
+	              text = format ? format(option) : option;
+	              value = option;
+	            }
 	            return _react2.default.createElement(
 	              'option',
-	              { key: 'option' + i, value: d },
-	              rowValue
+	              { key: 'option' + i, value: value },
+	              text
 	            );
 	          });
 	        })();
@@ -14647,6 +14670,16 @@ return /******/ (function(modules) { // webpackBootstrap
 	      this.pageObj = {};
 	      this.selected = [];
 	    }
+	  }, {
+	    key: 'isSearching',
+	    value: function isSearching() {
+	      return this.searchText !== null;
+	    }
+	  }, {
+	    key: 'isFiltering',
+	    value: function isFiltering() {
+	      return this.filterObj !== null;
+	    }
 	  }, {
 	    key: 'setData',
 	    value: function setData(data) {
@@ -14717,6 +14750,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	        }
 	      }
 	    }
+	  }, {
+	    key: 'cleanSortInfo',
+	    value: function cleanSortInfo() {
+	      this.sortList = [];
+	    }
 	  }, {
 	    key: 'setSelectedRowKey',
 	    value: function setSelectedRowKey(selectedRowKeys) {