Merge pull request #9618 from keymanapp/fix/web/toolbar-keyboard-chan…

…ge-refocus fix(web): fixes toolbar refocus timing after a keyboard change
keymanapp · Oct 2, 2023 · 966e5db · 966e5db
2 parents d2ed4c1 + 87d1a44
commit 966e5db
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/web/src/app/ui/kmwuitoolbar.ts b/web/src/app/ui/kmwuitoolbar.ts
@@ -824,10 +824,12 @@ if(!keyman?.ui?.name) {
         this.selectedLanguage = kbd.LanguageCode;
 
         // Return focus to input area and activate the selected keyboard
-        this.setLastFocus(); //*****this seems out of sequence???
         this.addKeyboardToList(lang, kbd);
         if(updateKeyman) {
-          keymanweb.setActiveKeyboard(kbd.InternalName, kbd.LanguageCode);
+          keymanweb.setActiveKeyboard(kbd.InternalName, kbd.LanguageCode).then(() => {
+            // Restore focus _after_ the keyboard finishes loading.
+            this.setLastFocus();
+          });
         }
         this.listedKeyboards[this.findListedKeyboard(lang)].buttonNode.className = 'kmw_button_selected';