From 5c24774170b25dd916c5bf212cc90cb1a552a51f Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Thu, 9 May 2024 13:03:05 +0200
Subject: [PATCH] fixed copy & paste commands

---
 packages/web/src/commands/stdCommands.ts |  8 ++++----
 packages/web/src/tabs/QueryTab.svelte    | 10 +++++-----
 packages/web/src/utility/contextMenu.ts  |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/web/src/commands/stdCommands.ts b/packages/web/src/commands/stdCommands.ts
index d774f1570..84360afce 100644
--- a/packages/web/src/commands/stdCommands.ts
+++ b/packages/web/src/commands/stdCommands.ts
@@ -646,12 +646,12 @@ export function registerFileCommands({
     });
   }
 
-  if(copyPaste) {
+  if (copyPaste) {
     registerCommand({
       id: idPrefix + '.copy',
       category,
       name: 'Copy',
-      keyText: 'CtrlOrCommand+C',
+      disableHandleKeyText: 'CtrlOrCommand+C',
       testEnabled: () => getCurrentEditor() != null,
       onClick: () => getCurrentEditor().copy(),
     });
@@ -659,10 +659,10 @@ export function registerFileCommands({
       id: idPrefix + '.paste',
       category,
       name: 'Paste',
-      keyText: 'CtrlOrCommand+V',
+      disableHandleKeyText: 'CtrlOrCommand+V',
       testEnabled: () => getCurrentEditor() != null,
       onClick: () => getCurrentEditor().paste(),
-    })
+    });
   }
 
   if (findReplace) {
diff --git a/packages/web/src/tabs/QueryTab.svelte b/packages/web/src/tabs/QueryTab.svelte
index 212f106d2..d24f0233e 100644
--- a/packages/web/src/tabs/QueryTab.svelte
+++ b/packages/web/src/tabs/QueryTab.svelte
@@ -1,6 +1,6 @@
 <script lang="ts" context="module">
-  import registerCommand from "../commands/registerCommand";
-  import {copyTextToClipboard} from "../utility/clipboard";
+  import registerCommand from '../commands/registerCommand';
+  import { copyTextToClipboard } from '../utility/clipboard';
 
   const getCurrentEditor = () => getActiveComponent('QueryTab');
 
@@ -40,7 +40,7 @@
     toggleComment: true,
     findReplace: true,
     executeAdditionalCondition: () => getCurrentEditor()?.hasConnection(),
-    copyPaste: true
+    copyPaste: true,
   });
   registerCommand({
     id: 'query.executeCurrent',
@@ -83,7 +83,7 @@
   import ToolStripExportButton, { createQuickExportHandlerRef } from '../buttons/ToolStripExportButton.svelte';
   import ToolStripSaveButton from '../buttons/ToolStripSaveButton.svelte';
   import ToolStripCommandSplitButton from '../buttons/ToolStripCommandSplitButton.svelte';
-  import {getClipboardText} from "../utility/clipboard";
+  import { getClipboardText } from '../utility/clipboard';
 
   export let tabid;
   export let conid;
@@ -250,7 +250,7 @@
   }
 
   export function paste() {
-    getClipboardText().then((text) => {
+    getClipboardText().then(text => {
       domEditor.getEditor().execCommand('paste', text);
     });
   }
diff --git a/packages/web/src/utility/contextMenu.ts b/packages/web/src/utility/contextMenu.ts
index 46365f2ed..78fb20723 100644
--- a/packages/web/src/utility/contextMenu.ts
+++ b/packages/web/src/utility/contextMenu.ts
@@ -97,7 +97,7 @@ function mapItem(item, commands) {
     if (command) {
       return {
         text: item.text || command.menuName || command.toolbarName || command.name,
-        keyText: command.keyText || command.keyTextFromGroup,
+        keyText: command.keyText || command.keyTextFromGroup || command.disableHandleKeyText,
         onClick: () => {
           if (command.isGroupCommand) {
             runGroupCommand(command.group);