From 1be87cbef8819f2a946a7599a2c39ee478982f9b Mon Sep 17 00:00:00 2001 From: Antonella Sgarlatta Date: Mon, 5 Jul 2021 14:43:09 -0300 Subject: [PATCH] fix: disable delete note shortcut for inputs --- app/assets/javascripts/services/ioService.ts | 5 +++++ app/assets/javascripts/views/editor/editor_view.ts | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/services/ioService.ts b/app/assets/javascripts/services/ioService.ts index bfc503dee..e1c775047 100644 --- a/app/assets/javascripts/services/ioService.ts +++ b/app/assets/javascripts/services/ioService.ts @@ -28,6 +28,7 @@ type KeyboardObserver = { elements?: HTMLElement[]; notElement?: HTMLElement; notElementIds?: string[]; + notTags?: string[]; }; export class IOService { @@ -175,6 +176,10 @@ export class IOService { continue; } + if (observer.notTags && observer.notTags.includes(target.tagName)) { + continue; + } + if ( this.eventMatchesKeyAndModifiers( event, diff --git a/app/assets/javascripts/views/editor/editor_view.ts b/app/assets/javascripts/views/editor/editor_view.ts index 822c4d50e..2e2936fac 100644 --- a/app/assets/javascripts/views/editor/editor_view.ts +++ b/app/assets/javascripts/views/editor/editor_view.ts @@ -863,7 +863,7 @@ class EditorViewCtrl extends PureViewCtrl { .io .addKeyObserver({ key: KeyboardKey.Backspace, - notElementIds: [ElementIds.NoteTextEditor, ElementIds.NoteTitleEditor], + notTags: ['INPUT', 'TEXTAREA'], modifiers: [KeyboardModifier.Meta], onKeyDown: () => { this.deleteNote(false);