From b772527f6603844fd1aa9a71ce5d88d917b056dd Mon Sep 17 00:00:00 2001 From: newcat Date: Mon, 1 Jan 2024 21:57:48 +0100 Subject: [PATCH] Fix Copy-Paste from a text control also duplicates the node #352 --- packages/renderer-vue/src/commands/hotkeyHandler.ts | 6 ++++++ packages/renderer-vue/src/node/Node.vue | 1 - packages/renderer-vue/src/sidebar/Sidebar.vue | 8 +------- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/renderer-vue/src/commands/hotkeyHandler.ts b/packages/renderer-vue/src/commands/hotkeyHandler.ts index eb5e917f..7c81f1d1 100644 --- a/packages/renderer-vue/src/commands/hotkeyHandler.ts +++ b/packages/renderer-vue/src/commands/hotkeyHandler.ts @@ -1,5 +1,7 @@ import { ref } from "vue"; +const INPUT_ELEMENT_TAGS = ["INPUT", "TEXTAREA", "SELECT"]; + export function useHotkeyHandler(executeCommand: (name: string) => void) { const pressedKeys = ref([]); const handlers = ref>([]); @@ -9,6 +11,10 @@ export function useHotkeyHandler(executeCommand: (name: string) => void) { pressedKeys.value.push(ev.key); } + if (INPUT_ELEMENT_TAGS.includes(document.activeElement?.tagName ?? "")) { + return; + } + handlers.value.forEach((h) => { if (h.keys.every((k) => pressedKeys.value.includes(k))) { executeCommand(h.commandName); diff --git a/packages/renderer-vue/src/node/Node.vue b/packages/renderer-vue/src/node/Node.vue index 6e88ebcb..ab3c1ea3 100644 --- a/packages/renderer-vue/src/node/Node.vue +++ b/packages/renderer-vue/src/node/Node.vue @@ -34,7 +34,6 @@ placeholder="Node Name" @blur="doneRenaming" @keydown.enter="doneRenaming" - @keydown.delete.stop /> diff --git a/packages/renderer-vue/src/sidebar/Sidebar.vue b/packages/renderer-vue/src/sidebar/Sidebar.vue index 38a06547..eac08acc 100644 --- a/packages/renderer-vue/src/sidebar/Sidebar.vue +++ b/packages/renderer-vue/src/sidebar/Sidebar.vue @@ -1,11 +1,5 @@