Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add SearchBar for layers selection #400

Merged
merged 8 commits into from
Oct 29, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
"jsPlumbUtil": false,
},
"rules": {
"max-len": [1, 150, 2, {ignoreComments: true}]
"max-len": [1, 150, 2, {ignoreComments: true}],
"no-console": "off"
},
"extends": ["eslint:recommended", "plugin:react/recommended"]
}
36 changes: 36 additions & 0 deletions ide/static/css/searchbar_style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
.insert-layer-title {
position: relative;
margin-top: 10px !important;
margin-bottom: 21px !important;
}

#layer-search-icon {
position: absolute;
left: -5px;
top: 31px;
}

#layer-search-icon:hover {
cursor: pointer;
}

#layer-search-input {
position: absolute;
top: 36px;
left: 20px;
font-size: 15px;
background: none;
border: none;
color: rgb(69, 80, 97);
outline: none;
opacity: 1;
transition: 0.3s;
}

.layer-search-input-selected {
opacity: 1 !important;
}

.matched-search-char {
color: rgb(69, 80, 97);
}
2 changes: 1 addition & 1 deletion ide/static/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -1206,4 +1206,4 @@ input[type="file"] {
background: white;
transform: rotate(-45deg)
}
}
}
6 changes: 5 additions & 1 deletion ide/static/js/content.js
Original file line number Diff line number Diff line change
Expand Up @@ -1275,7 +1275,11 @@ class Content extends React.Component {
/>
<h5 className="sidebar-heading">LOGIN</h5>
<Login setUserId={this.setUserId} setUserName={this.setUserName}></Login>
<h5 className="sidebar-heading">INSERT LAYER</h5>
<h5 className="sidebar-heading insert-layer-title">
<input id="layer-search-input" placeholder="Search for layer"></input>
<div id="insert-layer-sign">INSERT LAYER</div>
<i className="material-icons" id="layer-search-icon">search</i>
</h5>
<Pane
handleClick = {this.handleClick}
setDraggingLayer = {this.setDraggingLayer}
Expand Down
1 change: 1 addition & 0 deletions ide/static/js/layer.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ class Layer extends React.Component {
let highlightUser = null;
let highlightClass = '';
let highlightColor = '#000';


if(this.props.layer.highlight && this.props.layer.highlight.length > 0) {
highlightClass = 'highlighted';
Expand Down
56 changes: 55 additions & 1 deletion ide/static/js/pane.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,61 @@ class Pane extends React.Component {
}
this.setState(obj);
}
render(){
componentDidMount() {
let filter = (pattern) => {
let layerCompability = (searchQuery, layerName) => {
let j = 0;
let seq = [];
let full_match = true;
for (let i = 0; i < searchQuery.length; i++) {
while (j < layerName.length && layerName[j].toLowerCase() != searchQuery[i].toLowerCase()) {
seq[j] = false;
j++;
}
if (j < layerName.length && layerName[j].toLowerCase() == searchQuery[i].toLowerCase()) {
seq[j] = true;
j++;
} else {
full_match = false;
}
}
return {
match: seq,
full_match: full_match
};
}
for (let elem of $('.drowpdown-button')) {
let sub = elem.innerText;
if (!sub) continue;
let resp = layerCompability(pattern, sub);
if (resp.full_match) {
elem.style.display = 'block';
let final = '';
for (let i = 0; i < sub.length; i++) {
if (resp.match[i]) {
final += '<span class="matched-search-char">' + sub[i] + '</span>'
} else {
final += sub[i];
}
}
elem.innerHTML = final;
} else {
elem.style.display = 'none';
}
}
for (let elem of $('.panel-heading')) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is elem necessary here? As you have commented out the rest. (webpack error)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@thatbrguy elem is being used

let _p = pattern ? 'false' : 'true';
if (elem.getAttribute('aria-expanded') == _p) {
elem.click();
}
}
}
$('#layer-search-input').keyup((e) => {
filter(e.target.value);
});
}

render() {
return (
<div className="panel-group" id="menu" role="tablist" aria-multiselectable="true">
<div className="panel panel-default">
Expand Down
2 changes: 1 addition & 1 deletion ide/static/js/tabs.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ Tabs.propTypes = {
selectedPhase: React.PropTypes.number
};

export default Tabs;
export default Tabs;
3 changes: 3 additions & 0 deletions ide/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
<link rel="stylesheet" type="text/css" href="/static/fonts/font.css"/>
<link rel="stylesheet" type="text/css" href="/static/lib/bootstrap-3.3.6-dist/css/bootstrap-social.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons"
rel="stylesheet">
<link rel="stylesheet" type="text/css" href="/static/css/searchbar_style.css">

<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-110495971-1"></script>
Expand Down