From de5b417330a14e6ef2c9f76bb5d1690f586d0630 Mon Sep 17 00:00:00 2001 From: Colin Diesh Date: Thu, 20 Jul 2023 12:32:22 -0400 Subject: [PATCH] Add check for document.activeElement == INPUT before undo/redo (#3827) --- packages/app-core/src/HistoryManagement/index.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/app-core/src/HistoryManagement/index.ts b/packages/app-core/src/HistoryManagement/index.ts index e445fca318..5270589919 100644 --- a/packages/app-core/src/HistoryManagement/index.ts +++ b/packages/app-core/src/HistoryManagement/index.ts @@ -24,7 +24,8 @@ export function HistoryManagementMixin() { // ctrl+shift+z or cmd+shift+z (((e.ctrlKey || e.metaKey) && e.shiftKey && e.code === 'KeyZ') || // ctrl+y - (e.ctrlKey && !e.shiftKey && e.code === 'KeyY')) + (e.ctrlKey && !e.shiftKey && e.code === 'KeyY')) && + document.activeElement?.tagName.toUpperCase() !== 'INPUT' ) { self.history.redo() } @@ -33,7 +34,8 @@ export function HistoryManagementMixin() { // ctrl+z or cmd+z (e.ctrlKey || e.metaKey) && !e.shiftKey && - e.code === 'KeyZ' + e.code === 'KeyZ' && + document.activeElement?.tagName.toUpperCase() !== 'INPUT' ) { self.history.undo() }