EPUB/Snapshot: Fix focus getting stuck when link is hidden (#158)

zotero · Mar 4, 2025 · b74b017 · b74b017
1 parent 915d241
commit b74b017
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/dom/common/dom-view.tsx b/src/dom/common/dom-view.tsx
@@ -465,9 +465,13 @@ abstract class DOMView<State extends DOMViewState, Data> {
 				...this._iframeDocument.querySelectorAll('a, area'),
 				...this._annotationShadowRoot.querySelectorAll('[tabindex="-1"]')
 			] as (HTMLElement | SVGElement)[];
-			focusableElements = focusableElements.filter(
-				el => isPageRectVisible(getBoundingPageRect(el), this._iframeWindow, 0)
-			);
+			focusableElements = focusableElements.filter((el) => {
+				let style = getComputedStyle(el);
+				// Only include visible/focusable elements that are scrolled into view
+				return style.visibility === 'visible'
+					&& style.display !== 'none'
+					&& isPageRectVisible(getBoundingPageRect(el), this._iframeWindow, 0);
+			});
 			focusableElements.sort((a, b) => {
 				let rangeA;
 				if (a.getRootNode() === this._annotationShadowRoot && a.hasAttribute('data-annotation-id')) {