From 21c79374c35b78e558d086dc48dd50b3908fe5e6 Mon Sep 17 00:00:00 2001
From: "Joshua A. Horton" <joshua_horton@sil.org>
Date: Mon, 9 Oct 2023 10:15:02 +0700
Subject: [PATCH 1/2] fix(web): enhances integrated test stability

---
 web/src/app/browser/src/contextManager.ts | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/web/src/app/browser/src/contextManager.ts b/web/src/app/browser/src/contextManager.ts
index 492c627146d..cbe3ab30c48 100644
--- a/web/src/app/browser/src/contextManager.ts
+++ b/web/src/app/browser/src/contextManager.ts
@@ -184,7 +184,17 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
 
   public deactivateCurrentTarget() {
     const priorTarget = this.activeTarget || this.lastActiveTarget;
-    if(priorTarget) {
+
+    /* During integrated tests, it was possible in the past for a `beforeAll`
+     * -initialized KMW to reach this state between tests.  The target fixture
+     * got cleared, but the `mostRecentTarget` / `lastActiveTarget` was not
+     * - just the `currentTarget` / `activeTarget`.
+     *
+     * Newly-added code in `forgetActiveTarget` seeks to prevent this scenario,
+     * but as there's no consistent repro to prove it sufficient, an appropriate
+     * guard-condition has been added here too.
+     */
+    if(priorTarget && this.page.isAttached(priorTarget.getElement())) {
       this._BlurKeyboardSettings(priorTarget.getElement());
     }
 
@@ -198,12 +208,19 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
     this.focusAssistant.maintainingFocus = false;
     this.focusAssistant.restoringFocus = false;
 
-    const priorTarget = this.activeTarget || this.lastActiveTarget;
+    const priorTarget = this.activeTarget || this.mostRecentTarget;
     if(priorTarget) {
       this._BlurKeyboardSettings(priorTarget.getElement());
     }
 
+    // Will ensure that the element is no longer active.  Does not erase
+    // it from being the `lastActiveTarget`, though.
     this.setActiveTarget(null, true);
+
+    // So we erase it here.
+    if(priorTarget == this.lastActiveTarget) {
+      this.mostRecentTarget = null;
+    }
   }
 
   public setActiveTarget(target: OutputTarget<any>, sendEvents: boolean) {

From 35bebda7280326ee74da74ebf51670186b51b9f6 Mon Sep 17 00:00:00 2001
From: "Joshua A. Horton" <joshua_horton@sil.org>
Date: Mon, 9 Oct 2023 10:23:43 +0700
Subject: [PATCH 2/2] docs(web): comment referencing the PR

---
 web/src/app/browser/src/contextManager.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/app/browser/src/contextManager.ts b/web/src/app/browser/src/contextManager.ts
index cbe3ab30c48..42b79109ef7 100644
--- a/web/src/app/browser/src/contextManager.ts
+++ b/web/src/app/browser/src/contextManager.ts
@@ -188,7 +188,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
     /* During integrated tests, it was possible in the past for a `beforeAll`
      * -initialized KMW to reach this state between tests.  The target fixture
      * got cleared, but the `mostRecentTarget` / `lastActiveTarget` was not
-     * - just the `currentTarget` / `activeTarget`.
+     * - just the `currentTarget` / `activeTarget`.  See #9718.
      *
      * Newly-added code in `forgetActiveTarget` seeks to prevent this scenario,
      * but as there's no consistent repro to prove it sufficient, an appropriate