8e918dfdbb
* Ignore AltGr keystrokes in Ctrl+Alt keyboard shortcuts
Browsers report AltGr (right Alt on AZERTY/QWERTZ and most non-US
layouts, used to type @ # { } [ ] | \ and the euro sign) as
ctrlKey+altKey. The default keybinds map destructive actions to
Ctrl+Alt+<letter> (delete_session, new_session, incognito,
open_calendar), so a non-US user typing a special character could
silently fire them.
Guard the shortcut matcher, the editor keydown handler, and the rebind
capture with getModifierState('AltGraph'), which is true for AltGr but
false for a genuine left Ctrl+Alt. macOS is excluded: there the Option
key legitimately sets AltGraph and there is no AltGr/Ctrl+Alt collision
to guard against, so the guard would otherwise break Ctrl+Option /
Cmd+Option shortcuts (notably in Firefox).
The detection lives in one place — isAltGrEvent / IS_MAC in
static/js/platform.js — and all three call sites route through it, so the
guards can't drift apart.
The editor handler only skips the Ctrl+Alt chord block, so layout
shortcuts reachable via AltGr (e.g. [ ] brush size = AltGr+5/+8 on
AZERTY) keep working.
* Require Ctrl+Alt for the AltGr guard and consolidate keybind test marks
isAltGrEvent now also checks ctrlKey+altKey so it only suppresses the
"AltGr reported as Ctrl+Alt" collision; an event asserting AltGraph on
its own (a Linux ISO_Level3_Shift layout, a stray modifier) is left
alone. Pin it with test_isaltgr_false_when_altgraph_set_but_not_ctrl_alt.
Collapse the 12 per-test node skipif marks into one module-level
pytestmark, and note in platform.js why IS_MAC intentionally covers
iPad/iPhone and mirrors the isMac checks in calendar.js / sessions.js.
48 lines
2.4 KiB
JavaScript
48 lines
2.4 KiB
JavaScript
// ============================================
|
|
// Platform detection + AltGr-keystroke helper
|
|
// ============================================
|
|
// Shared by the keybind code: root keyboard-shortcuts.js, the editor's
|
|
// keyboard-shortcuts.js, and settings.js. Single source of truth so the three
|
|
// guards can't drift.
|
|
|
|
// AltGr (right Alt on AZERTY/QWERTZ and most non-US layouts, used to type
|
|
// @ # { } [ ] | \ and €) is reported by browsers as Ctrl+Alt. macOS is the
|
|
// exception: there the Option key — a normal part of Mac shortcuts — also sets
|
|
// the AltGraph modifier state, so it must NOT be treated as AltGr.
|
|
//
|
|
// IS_MAC covers all Apple platforms, iPad/iPhone included: a Magic Keyboard's
|
|
// Option key sets AltGraph exactly like a Mac's, so they need the same carve-out
|
|
// — narrowing to macOS-only would re-break them. The name and the
|
|
// /Mac|iPhone|iPad/ test deliberately mirror the existing isMac checks in
|
|
// calendar.js and sessions.js; this is their single shared source of truth.
|
|
export const IS_MAC =
|
|
/Mac|iPhone|iPad/.test((typeof navigator !== 'undefined' && navigator.platform) || '') ||
|
|
/Mac/.test((typeof navigator !== 'undefined' && navigator.userAgent) || '');
|
|
|
|
// True when `e` is an AltGr keystroke we should ignore for Ctrl+Alt shortcut
|
|
// purposes. getModifierState('AltGraph') is true for AltGr but false for a
|
|
// genuine left Ctrl+Alt, so real shortcuts still work. Always false on macOS,
|
|
// where Option legitimately sets AltGraph.
|
|
//
|
|
// We also require ctrlKey+altKey: the collision we defend against is precisely
|
|
// "AltGr reported AS Ctrl+Alt", so an event that asserts AltGraph WITHOUT
|
|
// presenting as Ctrl+Alt (a Linux ISO_Level3_Shift layout, a stray modifier
|
|
// state) is left alone instead of being swallowed.
|
|
//
|
|
// Trade-off: on Windows AltGr *is* Ctrl+right-Alt, so a deliberate
|
|
// Ctrl+Alt+<char> shortcut typed via AltGr is unreachable too — accepted; use
|
|
// the left Ctrl+Alt.
|
|
//
|
|
// NOTE: the AltGr -> AltGraph mapping is taken from the UI Events spec / MDN,
|
|
// not proven by our tests. Older Firefox and some Linux setups historically did
|
|
// not report AltGraph; where a browser sets ctrlKey+altKey without it this
|
|
// guard is simply a no-op (the pre-fix behaviour) rather than a regression.
|
|
export function isAltGrEvent(e, isMac = IS_MAC) {
|
|
return (
|
|
!isMac &&
|
|
!!e.ctrlKey &&
|
|
!!e.altKey &&
|
|
!!(e.getModifierState && e.getModifierState('AltGraph'))
|
|
);
|
|
}
|