fix conflicts

Author: AllenFang

CHANGELOG.md

@@ -1,3 +1,9 @@
+<a name="v3.3.3"></a>
+# [v3.3.3](https://github.com/AllenFang/react-bootstrap-table/compare/v3.3.2...v3.3.3) (2017-05-08)
+## Bug fixes
+* Avoid to throw error when `onfocus` function is not implement on custom cell editor([7104c6b](https://github.com/AllenFang/react-bootstrap-table/commit/7104c6b4f6611b9040d8de18649b5daded89cac2))
+* Fixed press ESC to leave the cell editing broken since from `v3.3.1`([283508](https://github.com/AllenFang/react-bootstrap-table/commit/28350864ecf6dace5d00f55bd4dbfaff8ddaacbd))
+
 <a name="v3.3.2"></a>
 # [v3.3.2](https://github.com/AllenFang/react-bootstrap-table/compare/v3.3.1...v3.3.2) (2017-05-07)
 ## Bug fixes

dist/react-bootstrap-table.js

@@ -30,7 +30,7 @@ function onAfterSaveCell(row, cellName, cellValue) {
     rowStr += prop + ': ' + row[prop] + '\n';
   }
 
-  alert('Thw whole row :\n' + rowStr);
+  alert('The whole row :\n' + rowStr);
 }
 
 function onBeforeSaveCell(row, cellName, cellValue) {

dist/react-bootstrap-table.js.map

@@ -38,7 +38,7 @@ function onSelectAll(isSelected) {
 
 function onAfterSaveCell(row, cellName, cellValue) {
   console.log(`Save cell ${cellName} with value ${cellValue}`);
-  console.log('Thw whole row :');
+  console.log('The whole row :');
   console.log(row);
 }
 

dist/react-bootstrap-table.min.js

@@ -244,6 +244,14 @@ class BootstrapTable extends Component {
         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

examples/js/cell-edit/cell-edit-hook-table.js

@@ -405,6 +405,8 @@ class TableBody extends Component {
       if (result !== Const.AWAIT_BEFORE_CELL_EDIT) {
         this.setState({ currEditCell: null });
       }
+    } else {
+      this.setState({ currEditCell: null });
     }
   }
 

examples/js/complex/app.js

@@ -41,6 +41,14 @@ export class TableDataStore {
     this.selected = [];
   }
 
+  isSearching() {
+    return this.searchText !== null;
+  }
+
+  isFiltering() {
+    return this.filterObj !== null;
+  }
+
   setData(data) {
     this.data = data;
     if (this.remote) {