build

Author: wmertens

build/reactable.js

@@ -1191,15 +1191,15 @@ window.ReactDOM["default"] = window.ReactDOM;
             value: function componentWillMount() {
                 this.initialize(this.props);
                 this.sortByCurrentSort();
-                this.filterBy(this.props.filterBy);
+                this.filterBy(this.props.filterBy != null ? this.props.filterBy : this.state.filter);
             }
         }, {
             key: 'componentWillReceiveProps',
             value: function 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);
             }
         }, {
             key: 'applyFilter',
@@ -1403,7 +1403,7 @@ window.ReactDOM["default"] = window.ReactDOM;
                         currentPage = numPages - 1;
                     }
 
-                    pagination = true;
+                    pagination = numPages > 1;
                     currentChildren = filteredChildren.slice(currentPage * itemsPerPage, (currentPage + 1) * itemsPerPage);
                 }
 

lib/reactable/table.js

@@ -244,15 +244,15 @@ var Table = (function (_React$Component) {
         value: function componentWillMount() {
             this.initialize(this.props);
             this.sortByCurrentSort();
-            this.filterBy(this.props.filterBy);
+            this.filterBy(this.props.filterBy != null ? this.props.filterBy : this.state.filter);
         }
     }, {
         key: 'componentWillReceiveProps',
         value: function 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);
         }
     }, {
         key: 'applyFilter',
@@ -456,7 +456,7 @@ var Table = (function (_React$Component) {
                     currentPage = numPages - 1;
                 }
 
-                pagination = true;
+                pagination = numPages > 1;
                 currentChildren = filteredChildren.slice(currentPage * itemsPerPage, (currentPage + 1) * itemsPerPage);
             }