From 4cee52ad18a0441bca7366d740fb64b1d98ad8df Mon Sep 17 00:00:00 2001
From: Jonatan Heyman <jonatan@heyman.info>
Date: Tue, 22 Apr 2025 11:54:10 +0200
Subject: [PATCH] Fix issue with ESC key not working immediately after the
 Settings dialog is opened the first time (due to it being registered after
 waiting for queryLocalFonts())

---
 src/components/settings/Settings.vue | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/components/settings/Settings.vue b/src/components/settings/Settings.vue
index d9ef2ad..98e3f71 100644
--- a/src/components/settings/Settings.vue
+++ b/src/components/settings/Settings.vue
@@ -74,16 +74,15 @@
         },
 
         async mounted() {
+            window.addEventListener("keydown", this.onKeyDown);
+
+            this.appVersion = await window.heynote.getVersion()
+
             if (window.queryLocalFonts !== undefined) {
                 let localFonts = [... new Set((await window.queryLocalFonts()).map(f => f.family))].filter(f => f !== "Hack")
                 localFonts = [...new Set(localFonts)].map(f => [f, f])
                 this.systemFonts = [[defaultFontFamily, defaultFontFamily + " (default)"], ...localFonts]
             }
-
-            window.addEventListener("keydown", this.onKeyDown);
-            this.$refs.keymapSelector.focus()
-
-            this.appVersion = await window.heynote.getVersion()
         },
         beforeUnmount() {
             window.removeEventListener("keydown", this.onKeyDown);
@@ -362,7 +361,7 @@
                         <div class="row">
                             <div class="entry">
                                 <h2>Keymap</h2>
-                                <select ref="keymapSelector" v-model="keymap" @change="updateSettings" class="keymap">
+                                <select v-model="keymap" @change="updateSettings" class="keymap">
                                     <template v-for="km in keymaps" :key="km.value">
                                         <option :selected="km.value === keymap" :value="km.value">{{ km.name }}</option>
                                     </template>