From e3ca6f2c24a1ce1ba62dd784f1344c6dcc4f4b75 Mon Sep 17 00:00:00 2001 From: AllenFang Date: Mon, 13 Aug 2018 22:01:15 +0800 Subject: [PATCH 1/2] Publish - react-bootstrap-table-next@1.1.1 --- packages/react-bootstrap-table2/package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/react-bootstrap-table2/package.json b/packages/react-bootstrap-table2/package.json index 1ab1ed6..29493ef 100644 --- a/packages/react-bootstrap-table2/package.json +++ b/packages/react-bootstrap-table2/package.json @@ -1,6 +1,6 @@ { "name": "react-bootstrap-table-next", - "version": "1.1.0", + "version": "1.1.1", "description": "Next generation of react-bootstrap-table", "main": "./lib/index.js", "repository": { @@ -36,7 +36,8 @@ } ], "dependencies": { - "classnames": "2.2.5" + "classnames": "2.2.5", + "underscore": "1.9.1" }, "peerDependencies": { "classnames": "^2.2.5", From 5e63d6ae59434bb0ff586fd186019c42c9487a11 Mon Sep 17 00:00:00 2001 From: AllenFang Date: Wed, 15 Aug 2018 23:08:46 +0800 Subject: [PATCH 2/2] avoid infinite remote search --- .../src/search/context.js | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/packages/react-bootstrap-table2-toolkit/src/search/context.js b/packages/react-bootstrap-table2-toolkit/src/search/context.js index 67935bf..c579999 100644 --- a/packages/react-bootstrap-table2-toolkit/src/search/context.js +++ b/packages/react-bootstrap-table2-toolkit/src/search/context.js @@ -20,11 +20,26 @@ export default (options = { searchText: PropTypes.string } + constructor(props) { + super(props); + this.performRemoteSearch = props.searchText !== ''; + } + + componentWillReceiveProps(nextProps) { + if (isRemoteSearch()) { + if (nextProps.searchText !== this.props.searchText) { + this.performRemoteSearch = true; + } else { + this.performRemoteSearch = false; + } + } + } + search() { const { data, columns } = this.props; let { searchText } = this.props; - if (isRemoteSearch()) { + if (isRemoteSearch() && this.performRemoteSearch) { handleRemoteSearchChange(searchText); return data; }