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

[MM-22585] Ctrl/Cmd+<num> now switches to tabs based on order (#1193)

Browse Source 
* [MM-22585] Ctrl/Cmd+<num> now switches to tabs based on order

* Added fix for hotkeying from SettingsPage
This commit is contained in:
Devin Binnie
2020-02-14 13:45:06 -05:00
committed by GitHub
parent eb66b789ba
commit c895535449
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/browser/components/MainPage.jsx
View File

@@ -34,7 +34,7 @@ export default class MainPage extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
let key = this.props.initialIndex; let key = this.props.teams.findIndex((team) => team.order === this.props.initialIndex);
if (this.props.deeplinkingUrl !== null) { if (this.props.deeplinkingUrl !== null) {
const parsedDeeplink = this.parseDeeplinkURL(this.props.deeplinkingUrl); const parsedDeeplink = this.parseDeeplinkURL(this.props.deeplinkingUrl);
if (parsedDeeplink) { if (parsedDeeplink) {
@@ -153,7 +153,8 @@ export default class MainPage extends React.Component {
// can't switch tabs sequentially for some reason... // can't switch tabs sequentially for some reason...
ipcRenderer.on('switch-tab', (event, key) => { ipcRenderer.on('switch-tab', (event, key) => {
this.handleSelect(key); const nextIndex = this.props.teams.findIndex((team) => team.order === key);
this.handleSelect(nextIndex);
}); });
ipcRenderer.on('select-next-tab', () => { ipcRenderer.on('select-next-tab', () => {
const currentOrder = this.props.teams[this.state.key].order; const currentOrder = this.props.teams[this.state.key].order;