fastforward to apache/master

This commit is contained in:
Hugh Miles
2018-01-24 17:05:57 -08:00
parent 36956a5d24
commit 63cbcb80c3
26 changed files with 278 additions and 85 deletions

View File

@@ -144,7 +144,8 @@ export default class ResultSet extends React.PureComponent {
}
render() {
const query = this.props.query;
const height = this.props.search ? this.props.height - SEARCH_HEIGHT : this.props.height;
const height = Math.max(0,
(this.props.search ? this.props.height - SEARCH_HEIGHT : this.props.height));
let sql;
if (this.props.showSql) {