Merge pull request #11743 from keymanapp/fix/web/newContext-device

fix(web): set new-context rules' device to match that of the active OSK
keymanapp · Jun 14, 2024 · b7c3611 · b7c3611
2 parents fe320ea + 7b4509a
commit b7c3611
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/web/src/engine/main/src/keymanEngine.ts b/web/src/engine/main/src/keymanEngine.ts
@@ -349,6 +349,10 @@ export default class KeymanEngine<
       this.core.keyboardProcessor.layerStore.handler = this.osk.layerChangeHandler;
     }
     this._osk = value;
+    // As the `new context` ruleset is designed to facilitate OSK layer-change updates
+    // based on the context being entered, we want the keyboard processor's current
+    // contextDevice to match that of the active OSK.  See #11740.
+    this.core.keyboardProcessor.contextDevice = value.targetDevice ?? this.config.softDevice;
     if(value) {
       // Don't build an OSK if no keyboard is available yet; avoid the extra flash.
       if(this.contextManager.activeKeyboard) {