Fix empty find popup not closing when focusing a view on Firefox/Zotero

zotero · Mar 4, 2024 · 16cf97d · 16cf97d
1 parent 75dc9ec
commit 16cf97d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/common/focus-manager.js b/src/common/focus-manager.js
@@ -56,21 +56,25 @@ export class FocusManager {
 		});
 	}
 
+	_closeFindPopupIfEmpty() {
+		let state = this._reader._state.primaryViewFindState;
+		if (state && !state.query) {
+			this._reader._updateState({ primaryViewFindState: { ...state, popupOpen: false } });
+		}
+		state = this._reader._state.secondaryViewState;
+		if (state && !state.query) {
+			this._reader._updateState({ secondaryViewState: { ...state, popupOpen: false } });
+		}
+	}
+
 	_handleFocus(event) {
 		if ('closest' in event.target) {
 			if (!event.target.closest('.annotation, .annotation-popup, .selection-popup, .label-popup, .context-menu, iframe')) {
 				this._onDeselectAnnotations();
 			}
 			// Close find popup on blur if search query is empty
 			if (!event.target.closest('.find-popup')) {
-				let state = this._reader._state.primaryViewFindState;
-				if (state && !state.query) {
-					this._reader._updateState({ primaryViewFindState: { ...state, popupOpen: false } });
-				}
-				state = this._reader._state.secondaryViewState;
-				if (state && !state.query) {
-					this._reader._updateState({ secondaryViewState: { ...state, popupOpen: false } });
-				}
+				this._closeFindPopupIfEmpty();
 			}
 		}
 	}

diff --git a/src/common/reader.js b/src/common/reader.js
@@ -685,6 +685,8 @@ class Reader {
 
 		let onFocus = () => {
 			this.focusView(primary);
+			// A workaround for Firefox/Zotero because iframe focusing doesn't trigger 'focusin' event
+			this._focusManager._closeFindPopupIfEmpty();
 		};
 
 		let onRequestPassword = () => {