From 1bfa004e650a7388dc1e22f1d441112a7977bcfb Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Thu, 14 Oct 2021 08:17:50 +0200
Subject: [PATCH] focus fixes

---
 packages/web/src/datagrid/DataGridCore.svelte | 2 +-
 packages/web/src/tabs/QueryTab.svelte         | 1 +
 packages/web/src/utility/clipboard.js         | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/web/src/datagrid/DataGridCore.svelte b/packages/web/src/datagrid/DataGridCore.svelte
index 34fc8b308..36b3dccac 100644
--- a/packages/web/src/datagrid/DataGridCore.svelte
+++ b/packages/web/src/datagrid/DataGridCore.svelte
@@ -365,7 +365,7 @@
     });
     const text = lines.join('\r\n');
     copyTextToClipboard(text);
-    if (domFocusField) domFocusField.focus();
+    // if (domFocusField) domFocusField.focus();
   }
 
   export function loadNextDataIfNeeded() {
diff --git a/packages/web/src/tabs/QueryTab.svelte b/packages/web/src/tabs/QueryTab.svelte
index 48253a951..8cb287992 100644
--- a/packages/web/src/tabs/QueryTab.svelte
+++ b/packages/web/src/tabs/QueryTab.svelte
@@ -204,6 +204,7 @@
       onInsert: text => {
         const editor = domEditor.getEditor();
         editor.session.insert(editor.getCursorPosition(), text);
+        domEditor?.getEditor()?.focus();
       },
     });
   }
diff --git a/packages/web/src/utility/clipboard.js b/packages/web/src/utility/clipboard.js
index dabbe22d1..a2b7081c3 100644
--- a/packages/web/src/utility/clipboard.js
+++ b/packages/web/src/utility/clipboard.js
@@ -1,4 +1,6 @@
 export function copyTextToClipboard(text) {
+  const oldFocus = document.activeElement;
+
   const textArea = document.createElement('textarea');
 
   //
@@ -53,4 +55,6 @@ export function copyTextToClipboard(text) {
   }
 
   document.body.removeChild(textArea);
+
+  if (oldFocus) oldFocus.focus();
 }