mirror of
https://github.com/mattermost/mattermost.git
synced 2025-02-25 18:55:24 -06:00
Update sidebar header dropdown to close properly (#6488)
This commit is contained in:
committed by
Christopher Speller
parent
f47dd2d36d
commit
b28227ff6b
@@ -78,9 +78,14 @@ export default class SidebarHeaderDropdown extends React.Component {
|
||||
}
|
||||
}
|
||||
|
||||
toggleDropdown(e) {
|
||||
if (e) {
|
||||
e.preventDefault();
|
||||
toggleDropdown(val) {
|
||||
if (typeof (val) === 'boolean') {
|
||||
this.setState({showDropdown: val});
|
||||
return;
|
||||
}
|
||||
|
||||
if (val && val.preventDefault) {
|
||||
val.preventDefault();
|
||||
}
|
||||
|
||||
this.setState({showDropdown: !this.state.showDropdown});
|
||||
@@ -161,7 +166,8 @@ export default class SidebarHeaderDropdown extends React.Component {
|
||||
onTeamChange() {
|
||||
this.setState({
|
||||
teamMembers: TeamStore.getMyTeamMembers(),
|
||||
teamListings: TeamStore.getTeamListings()
|
||||
teamListings: TeamStore.getTeamListings(),
|
||||
showDropdown: false
|
||||
});
|
||||
}
|
||||
|
||||
@@ -596,8 +602,8 @@ export default class SidebarHeaderDropdown extends React.Component {
|
||||
return (
|
||||
<Dropdown
|
||||
id='sidebar-header-dropdown'
|
||||
defaultOpen={this.state.showDropdown}
|
||||
onClose={this.toggleDropdown}
|
||||
open={this.state.showDropdown}
|
||||
onToggle={this.toggleDropdown}
|
||||
className='sidebar-header-dropdown'
|
||||
pullRight={true}
|
||||
>
|
||||
|
||||
Reference in New Issue
Block a user