From 07daee7b1604760e3e1bbfdfaff0b547dd3e4d06 Mon Sep 17 00:00:00 2001
From: jahorton <jahorton@sil.org>
Date: Fri, 4 Dec 2020 13:39:04 +0700
Subject: [PATCH] fix(common/models): fixes post-wordbreak suggestions

---
 common/predictive-text/worker/model-compositor.ts | 1 +
 web/source/osk/banner.ts                          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/common/predictive-text/worker/model-compositor.ts b/common/predictive-text/worker/model-compositor.ts
index b9a15f9aa1..416058512a 100644
--- a/common/predictive-text/worker/model-compositor.ts
+++ b/common/predictive-text/worker/model-compositor.ts
@@ -150,6 +150,7 @@ class ModelCompositor {
         if(this.isEmpty(inputTransform) || this.isWhitespace(inputTransform)) {
           newEmptyToken = true;
           prefixTransform = inputTransform;
+          context = postContext; // Ensure the whitespace token is preapplied!
         }
       }
 
diff --git a/web/source/osk/banner.ts b/web/source/osk/banner.ts
index 440e48cb97..ae988114ce 100644
--- a/web/source/osk/banner.ts
+++ b/web/source/osk/banner.ts
@@ -690,6 +690,7 @@ namespace com.keyman.osk {
 
       // Do we have a keep suggestion?  If so, remove it from the list so that we can control its display position
       // and prevent it from being hidden after reversion operations.
+      this.keepSuggestion = null;
       for(let s of suggestions) {
         if(s.tag == 'keep') {
           this.keepSuggestion = s as Keep;