Skip to content

Commit

Permalink
Revert "[sql-lab] revert react-virtualized-select (#2489)" (#2491)
Browse files Browse the repository at this point in the history
This reverts commit 7eafbab.
  • Loading branch information
Alanna Scott authored Mar 27, 2017
1 parent 93551a6 commit dd7b4b8
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
const $ = window.$ = require('jquery');
import React from 'react';
import Select from 'react-select';
import { Button } from 'react-bootstrap';
import TableElement from './TableElement';
import AsyncSelect from '../../components/AsyncSelect';
import Select from 'react-virtualized-select';
import createFilterOptions from 'react-select-fast-filter-options';

const propTypes = {
queryEditor: React.PropTypes.object.isRequired,
Expand Down Expand Up @@ -59,8 +60,8 @@ class SqlEditorLeftBar extends React.PureComponent {
if (!this.props.queryEditor.dbId || !input) {
return Promise.resolve({ options: [] });
}
const url = `/superset/tables/${this.props.queryEditor.dbId}/\
${this.props.queryEditor.schema}/${input}`;
const url = `/superset/tables/${this.props.queryEditor.dbId}/` +
`${this.props.queryEditor.schema}/${input}`;
return $.get(url).then((data) => ({ options: data.options }));
}
// TODO: move fetching methods to the actions.
Expand Down Expand Up @@ -124,6 +125,8 @@ ${this.props.queryEditor.schema}/${input}`;
}
render() {
const shouldShowReset = window.location.search === '?reset=1';
const options = this.state.tableOptions;
const filterOptions = createFilterOptions({ options });
return (
<div className="scrollbar-container">
<div className="clearfix sql-toolbar scrollbar-content">
Expand Down Expand Up @@ -169,11 +172,13 @@ ${this.props.queryEditor.schema}/${input}`;
placeholder={`Add a table (${this.state.tableOptions.length})`}
autosize={false}
onChange={this.changeTable.bind(this)}
filterOptions={filterOptions}
options={this.state.tableOptions}
/>
}
{!this.props.queryEditor.schema &&
<Select.Async
<Select
async
name="async-select-table"
ref="selectTable"
value={this.state.tableName}
Expand Down
3 changes: 3 additions & 0 deletions superset/assets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
"nvd3": "1.8.5",
"react": "^15.3.2",
"react-ace": "^4.1.5",
"react-addons-shallow-compare": "^15.4.2",
"react-bootstrap": "^0.30.3",
"react-bootstrap-table": "^2.3.8",
"react-dom": "^15.3.2",
Expand All @@ -76,7 +77,9 @@
"react-redux": "^5.0.2",
"react-resizable": "^1.3.3",
"react-select": "^1.0.0-rc.2",
"react-select-fast-filter-options": "^0.2.1",
"react-syntax-highlighter": "^5.0.0",
"react-virtualized-select": "^2.4.0",
"reactable": "^0.14.0",
"redux": "^3.5.2",
"redux-localstorage": "^0.4.1",
Expand Down
28 changes: 28 additions & 0 deletions superset/assets/stylesheets/react-select/select.less
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,31 @@
@import "../../node_modules/react-select/less/mixins.less";
@import "../../node_modules/react-select/less/multi.less";
@import "../../node_modules/react-select/less/spinner.less";
@import "../../node_modules/react-virtualized/styles.css";

// importing css from "../../node_modules/react-virtualized-select/styles.css";
// so the background color of a selected option matches the other selects
.VirtualSelectGrid {
z-index: 1;
}
.VirtualizedSelectOption {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
padding: 0 .5rem;
}
.VirtualizedSelectFocusedOption {
background-color: rgba(0, 0, 0, 0.1);
}
.VirtualizedSelectFocusedOption:hover {
cursor: pointer;
}
.VirtualizedSelectDisabledOption {
opacity: 0.5;
}
.VirtualizedSelectSelectedOption {
font-weight: bold;
}

0 comments on commit dd7b4b8

Please sign in to comment.