phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Show topbar regardless of whether there are servers or not (#1723)

Browse Source 
* Show topbar regardless of whether there are servers or not

* Update src/renderer/components/TeamDropdownButton.tsx

Co-authored-by: Guillermo Vayá <guivaya@gmail.com>

Co-authored-by: Guillermo Vayá <guivaya@gmail.com>
This commit is contained in:
Devin Binnie
2021-09-09 09:10:16 -04:00
committed by GitHub
parent 07299fb2bd
commit ed57722086
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/renderer/components/MainPage.tsx
View File

@@ -223,6 +223,16 @@ export default class MainPage extends React.PureComponent<Props, State> {
}
});
}
window.addEventListener('click', this.handleCloseTeamsDropdown);
}
componentWillUnmount() {
window.removeEventListener('click', this.handleCloseTeamsDropdown);
}
handleCloseTeamsDropdown = () => {
window.ipcRenderer.send(CLOSE_TEAMS_DROPDOWN);
}
handleMaximizeState = (_: IpcRendererEvent, maximized: boolean) => {
@@ -295,18 +305,11 @@ export default class MainPage extends React.PureComponent<Props, State> {
focusOnWebView = () => {
window.ipcRenderer.send(FOCUS_BROWSERVIEW);
window.ipcRenderer.send(CLOSE_TEAMS_DROPDOWN);
this.handleCloseTeamsDropdown();
}
render() {
if (!this.state.activeServerName || !this.state.activeTabName) {
return null;
}
const currentTabs = this.props.teams.find((team) => team.name === this.state.activeServerName)?.tabs;
if (!currentTabs) {
// TODO: figure out something here
return null;
}
const currentTabs = this.props.teams.find((team) => team.name === this.state.activeServerName)?.tabs || [];
const tabsRow = (
<TabBar