Fix infinite recursion in DOMView#focus()

zotero · Aug 16, 2023 · c26e1bb · c26e1bb
1 parent c4c0dfd
commit c26e1bb
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/dom/common/dom-view.tsx b/src/dom/common/dom-view.tsx
@@ -948,9 +948,11 @@ abstract class DOMView<State extends DOMViewState, Data> {
 	// ***
 
 	focus() {
-		// The iframe sometimes won't correctly get focus unless we focus the outer window first
-		window.focus();
-		this._iframe.focus();
+		if (document.activeElement !== this._iframe || !this._iframeDocument.activeElement) {
+			// The iframe sometimes won't correctly get focus unless we focus the outer window first
+			window.focus();
+			this._iframe.focus();
+		}
 	}
 
 	navigate(location: NavLocation, options: NavigateOptions = {}) {