From 5701ab72b5125cdc3c9cf9f043ee1fda4b3ec65a Mon Sep 17 00:00:00 2001
From: Mark MacKay <mark@duopixel.com>
Date: Sat, 1 May 2021 15:58:06 -0500
Subject: [PATCH] fixing keys when focused

---
 src/js/Keyboard.js | 4 ++--
 src/js/editor.js   | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/js/Keyboard.js b/src/js/Keyboard.js
index 6197504..7345a28 100644
--- a/src/js/Keyboard.js
+++ b/src/js/Keyboard.js
@@ -59,7 +59,8 @@ MD.Keyboard = function(){
   };
 
   document.addEventListener("keydown", function(e){
-    if ($("#color_picker").is(":visible")) return e;
+    const exceptions = $(":focus").length || $("#color_picker").is(":visible");
+    if (exceptions) return false;
     const modKey = !svgedit.browser.isMac() ? "ctrlKey" : "metaKey";
     const cmd = e[modKey] ? "cmd_" : "";
     const shift = e.shiftKey ? "shift_" : "";
@@ -92,7 +93,6 @@ MD.Keyboard = function(){
       e.preventDefault();
       keys[key]();
     }
-
   })
 
   // modal shortcuts
diff --git a/src/js/editor.js b/src/js/editor.js
index 4606d85..fec742e 100644
--- a/src/js/editor.js
+++ b/src/js/editor.js
@@ -141,7 +141,10 @@ MD.Editor = function(){
   function escapeMode(){
     for (key in editor.modal) editor.modal[key].close();
     state.set("canvasMode", "select");
-    state.set("canvasContent", svgCanvas.getSvgString())
+    if ($("#cur_context_panel").is(":visible"))
+      svgCanvas.leaveContext()
+    else
+      state.set("canvasContent", svgCanvas.getSvgString())
   }
 
   // called when we've selected a different element
@@ -191,6 +194,7 @@ MD.Editor = function(){
       elems: elems
     });
 
+    // todo svgCanvas.getCurrentContext is needed
     if (!$("#cur_context_panel").is(":visible"))
       state.set("canvasContent", svgCanvas.getSvgString())
   }