keep filter field expanded if it has text in it
This commit is contained in:
parent
b9421e4269
commit
ea7cbbc0ee
1 changed files with 8 additions and 5 deletions
|
@ -82,7 +82,7 @@ const LeftPanel = React.createClass({
|
||||||
if (this.state.searchFilter !== nextState.searchFilter) {
|
if (this.state.searchFilter !== nextState.searchFilter) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (this.state.searchFocused !== nextState.searchFocused) {
|
if (this.state.searchExpanded !== nextState.searchExpanded) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -207,6 +207,7 @@ const LeftPanel = React.createClass({
|
||||||
if (source === "keyboard") {
|
if (source === "keyboard") {
|
||||||
dis.dispatch({action: 'focus_composer'});
|
dis.dispatch({action: 'focus_composer'});
|
||||||
}
|
}
|
||||||
|
this.setState({searchExpanded: false});
|
||||||
},
|
},
|
||||||
|
|
||||||
collectRoomList: function(ref) {
|
collectRoomList: function(ref) {
|
||||||
|
@ -214,11 +215,13 @@ const LeftPanel = React.createClass({
|
||||||
},
|
},
|
||||||
|
|
||||||
_onSearchFocus: function() {
|
_onSearchFocus: function() {
|
||||||
this.setState({searchFocused: true});
|
this.setState({searchExpanded: true});
|
||||||
},
|
},
|
||||||
|
|
||||||
_onSearchBlur: function() {
|
_onSearchBlur: function(event) {
|
||||||
this.setState({searchFocused: false});
|
if (event.target.value.length === 0) {
|
||||||
|
this.setState({searchExpanded: false});
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
render: function() {
|
render: function() {
|
||||||
|
@ -256,7 +259,7 @@ const LeftPanel = React.createClass({
|
||||||
let exploreButton;
|
let exploreButton;
|
||||||
if (!this.props.collapsed) {
|
if (!this.props.collapsed) {
|
||||||
exploreButton = (
|
exploreButton = (
|
||||||
<div className={classNames("mx_LeftPanel_explore", {"mx_LeftPanel_explore_hidden": this.state.searchFocused})}>
|
<div className={classNames("mx_LeftPanel_explore", {"mx_LeftPanel_explore_hidden": this.state.searchExpanded})}>
|
||||||
<AccessibleButton onClick={() => dis.dispatch({action: 'view_room_directory'})}>{_t("Explore")}</AccessibleButton>
|
<AccessibleButton onClick={() => dis.dispatch({action: 'view_room_directory'})}>{_t("Explore")}</AccessibleButton>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in a new issue