Restore focus after closing popup

zotero · Jun 21, 2024 · d575d00 · d575d00
1 parent 3e65e2f
commit d575d00
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/common/focus-manager.js b/src/common/focus-manager.js
@@ -15,7 +15,7 @@ export class FocusManager {
 		// Some browsers (Chrome) trigger focus event when focusing an iframe and some not (Firefox),
 		// therefore just use an interval because document.activeElement is always correct
 		setInterval(() => {
-			if (document.activeElement !== document.body && !document.activeElement.closest('.context-menu')) {
+			if (document.activeElement !== document.body && !document.activeElement.closest('.context-menu-overlay')) {
 				this._lastActiveElement = document.activeElement;
 			}
 		}, 100);

diff --git a/src/common/reader.js b/src/common/reader.js
@@ -676,6 +676,9 @@ class Reader {
 				document.querySelector(selector)?.focus();
 			}, 100);
 		}
+		else {
+			this._focusManager.restoreFocus();
+		}
 	}
 
 	toggleFindPopup({ primary, open } = {}) {