resolved merge conflict

pixiebrix · Mar 7, 2024 · f439bb6 · f439bb6
1 parent c40c696
commit f439bb6
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/utils/focusController.ts b/src/utils/focusController.ts
@@ -41,6 +41,13 @@ const focusController = {
     // Only HTMLElements can have their focus restored, but we're currently ignoring this distinction
     const active = document.activeElement as HTMLElement;
 
+    if (active === document.body) {
+      // Don't save the body as the focused element. Can happen if when the user clicks the text selection popover,
+      // which then disappears.
+      focusedElement = undefined;
+      return;
+    }
+
     if (focusedElement != null && focusedElement !== active) {
       console.warn(
         "focusController: the previously-saved focus is being overridden",