imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2568 from matrix-org/bwindels/fixcollapsesearchterm

Browse source 
Fix: search term disappears when collapsing and expanding left panel
This commit is contained in:
David Baker 2019-02-05 10:45:07 +00:00 • committed by GitHub
commit 8598c4f9a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/components/structures/LeftPanel.js
View file

@ -199,9 +199,10 @@ const LeftPanel = React.createClass({
}, },
); );
const searchBox = !this.props.collapsed ? const searchBox = (<SearchBox
<SearchBox onSearch={ this.onSearch } onCleared={ this.onSearchCleared } /> : onSearch={ this.onSearch }
undefined; onCleared={ this.onSearchCleared }
collapsed={this.props.collapsed} />);
return ( return (
<div className={containerClasses}> <div className={containerClasses}>

9
src/components/structures/SearchBox.js
View file

@ -95,8 +95,13 @@ module.exports = React.createClass({
}, },
render: function() { render: function() {
const TintableSvg = sdk.getComponent('elements.TintableSvg'); // check for collapsed here and
// not at parent so we keep
// searchTerm in our state
// when collapsing and expanding
if (this.props.collapsed) {
return null;
}
const clearButton = this.state.searchTerm.length > 0 ? const clearButton = this.state.searchTerm.length > 0 ?
(<AccessibleButton key="button" (<AccessibleButton key="button"
className="mx_SearchBox_closeButton" className="mx_SearchBox_closeButton"