Update table.jsx

glittershark · Jan 7, 2016 · 8727e97 · 8727e97
1 parent 9adf60b
commit 8727e97
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/reactable/table.jsx b/src/reactable/table.jsx
@@ -204,14 +204,14 @@ export class Table extends React.Component {
     componentWillMount() {
         this.initialize(this.props);
         this.sortByCurrentSort();
-        this.filterBy(this.props.filterBy);
+        this.filterBy(this.props.filterBy != null ? this.props.filterBy : this.state.filter);
     }
 
     componentWillReceiveProps(nextProps) {
         this.initialize(nextProps);
         this.updateCurrentSort(nextProps.sortBy);
         this.sortByCurrentSort();
-        this.filterBy(nextProps.filterBy);
+        this.filterBy(nextProps.filterBy != null ? nextProps.filterBy : this.state.filter);
     }
 
     applyFilter(filter, children) {