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

#1960 fix unexpected top menu focus (#1963)

Browse Source 
* #1960 fix unexpected top menu focus

* #1960 test update

* #1960 improved test

* #1960 optimized algrithm to handle only Alt key to improve performance and avoid side effects

* #1960 tests update

* #1960 fixed 3 dit menu focus on workspace change with Alt+1, Alt+2

* #313 fix linter issue

* #1960 fix linter issue

* tests update
This commit is contained in:
Profesor08
2022-02-08 06:23:51 -08:00
committed by GitHub
parent 301ba8deb2
commit 1c71579bbe
3 changed files with 47 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/main/views/MattermostView.ts
View File

@@ -62,14 +62,14 @@ export class MattermostView extends EventEmitter {
currentFavicon?: string;
hasBeenShown: boolean;
altTimeout?: number;
altLastPressed?: boolean;
contextMenu: ContextMenu;
status?: Status;
retryLoad?: NodeJS.Timeout;
maxRetries: number;
private altPressStatus: boolean;
constructor(tab: TabView, serverInfo: ServerInfo, win: BrowserWindow, options: BrowserViewConstructorOptions) {
super();
this.tab = tab;
@@ -98,7 +98,6 @@ export class MattermostView extends EventEmitter {
this.hasBeenShown = false;
if (process.platform !== 'darwin') {
this.altLastPressed = false;
this.view.webContents.on('before-input-event', this.handleInputEvents);
}
@@ -118,6 +117,12 @@ export class MattermostView extends EventEmitter {
this.contextMenu = new ContextMenu({}, this.view);
this.maxRetries = MAX_SERVER_RETRIES;
this.altPressStatus = false;
this.window.on('blur', () => {
this.altPressStatus = false;
});
}
// use the same name as the server
@@ -288,24 +293,27 @@ export class MattermostView extends EventEmitter {
return this.view.webContents;
}
handleInputEvents = (_: Event, input: Input) => {
// Handler for pressing the Alt key to focus the 3-dot menu
if (input.key === 'Alt' && input.type === 'keyUp' && this.altLastPressed) {
this.altLastPressed = false;
clearTimeout(this.altTimeout);
WindowManager.focusThreeDotMenu();
return;
private registerAltKeyPressed = (input: Input) => {
const isAltPressed = input.key === 'Alt' && input.alt === true && input.control === false && input.shift === false && input.meta === false;
if (input.type === 'keyDown') {
this.altPressStatus = isAltPressed;
}
// Hack to detect keyPress so that alt+<key> combinations don't default back to the 3-dot menu
if (input.key === 'Alt' && input.type === 'keyDown') {
this.altLastPressed = true;
this.altTimeout = setTimeout(() => {
this.altLastPressed = false;
}, 500) as unknown as number;
} else {
this.altLastPressed = false;
clearTimeout(this.altTimeout);
if (input.key !== 'Alt') {
this.altPressStatus = false;
}
};
private isAltKeyReleased = (input: Input) => {
return input.type === 'keyUp' && this.altPressStatus === true;
};
handleInputEvents = (_: Event, input: Input) => {
this.registerAltKeyPressed(input);
if (this.isAltKeyReleased(input)) {
WindowManager.focusThreeDotMenu();
}
}