Commit 8a07c59b authored by gshawn3's avatar gshawn3

fix for #11534: canvas zoom and pan extension hijacking shortcut keys

parent 394ffa7b
......@@ -608,6 +608,11 @@ onUiLoaded(async() => {
// Handle keydown events
function handleKeyDown(event) {
// before activating shortcut, ensure user is not actively typing in an input field
if(event.target.nodeName === 'TEXTAREA' || event.target.nodeName === 'INPUT') {
event.preventDefault;
} else {
const hotkeyActions = {
[hotkeysConfig.canvas_hotkey_reset]: resetZoom,
[hotkeysConfig.canvas_hotkey_overlap]: toggleOverlap,
......@@ -627,6 +632,7 @@ onUiLoaded(async() => {
event.preventDefault();
}
}
}
// Get Mouse position
function getMousePosition(e) {
......@@ -687,6 +693,10 @@ onUiLoaded(async() => {
// Handle the move event for pan functionality. Updates the panX and panY variables and applies the new transform to the target element.
function handleMoveKeyDown(e) {
if (e.code === hotkeysConfig.canvas_hotkey_move) {
// before activating shortcut, ensure user is not actively typing in an input field
if(e.target.nodeName === 'TEXTAREA' || e.target.nodeName === 'INPUT') {
event.preventDefault;
} else {
if (!e.ctrlKey && !e.metaKey && isKeyDownHandlerAttached) {
e.preventDefault();
document.activeElement.blur();
......@@ -694,6 +704,7 @@ onUiLoaded(async() => {
}
}
}
}
function handleMoveKeyUp(e) {
if (e.code === hotkeysConfig.canvas_hotkey_move) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment