Merge pull request #10039 from keymanapp/fix/web/app-context-deadkey-…

…reset fix(web): app/webview did not clear deadkeys on context-reset
keymanapp · Nov 23, 2023 · 4970664 · 4970664
2 parents 2a9a9e7 + 0f32515
commit 4970664
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/common/web/keyboard-processor/src/text/keyboardProcessor.ts b/common/web/keyboard-processor/src/text/keyboardProcessor.ts
@@ -570,6 +570,9 @@ export default class KeyboardProcessor extends EventEmitter<EventMap> {
 
   resetContext(target?: OutputTarget) {
     this.layerId = 'default';
+
+    // Make sure all deadkeys for the context get cleared properly.
+    target?.resetContext();
     this.keyboardInterface.resetContextCache();
 
     // May be null if it's a keyboard swap.

diff --git a/web/src/engine/main/src/keymanEngine.ts b/web/src/engine/main/src/keymanEngine.ts
@@ -202,6 +202,8 @@ export default class KeymanEngine<
 
     this.contextManager.configure({
       resetContext: (target) => {
+        // Could reset the target's deadkeys here, but it's really more of a 'core' task.
+        // So we delegate that to keyboard-processor.
         this.core.resetContext(target);
       },
       predictionContext: new PredictionContext(this.core.languageProcessor, this.core.keyboardProcessor),