Skip to content

Fix keyboard layout detection #205193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexdima merged 2 commits into from
Mar 14, 2024
Merged

Fix keyboard layout detection #205193

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e32e2b2
Fallback on keyboard event if getLayoutMap is not allowed
Feb 14, 2024
f9228e5
fix: do not try to call again getLayoutMap if it fails
Feb 14, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export class BrowserKeyboardMapperFactoryBase extends Disposable {
protected _keymapInfos: KeymapInfo[];
protected _mru: KeymapInfo[];
private _activeKeymapInfo: KeymapInfo | null;
private keyboardLayoutMapAllowed: boolean = (navigator as any).keyboard !== undefined;

get activeKeymap(): KeymapInfo | null {
return this._activeKeymapInfo;
Expand Down Expand Up @@ -394,7 +395,7 @@ export class BrowserKeyboardMapperFactoryBase extends Disposable {
}

private async _getBrowserKeyMapping(keyboardEvent?: IKeyboardEvent): Promise<IRawMixedKeyboardMapping | null> {
if ((navigator as any).keyboard) {
if (this.keyboardLayoutMapAllowed) {
try {
return await (navigator as any).keyboard.getLayoutMap().then((e: any) => {
const ret: IKeyboardMapping = {};
Expand All @@ -419,8 +420,10 @@ export class BrowserKeyboardMapperFactoryBase extends Disposable {
});
} catch {
// getLayoutMap can throw if invoked from a nested browsing context
this.keyboardLayoutMapAllowed = false;
}
} else if (keyboardEvent && !keyboardEvent.shiftKey && !keyboardEvent.altKey && !keyboardEvent.metaKey && !keyboardEvent.metaKey) {
}
if (keyboardEvent && !keyboardEvent.shiftKey && !keyboardEvent.altKey && !keyboardEvent.metaKey && !keyboardEvent.metaKey) {
const ret: IKeyboardMapping = {};
const standardKeyboardEvent = keyboardEvent as StandardKeyboardEvent;
ret[standardKeyboardEvent.browserEvent.code] = {
Expand Down