improve handling of selected content (fix #1417)

gildas-lormeau · Mar 28, 2024 · f7a5a7f · f7a5a7f
1 parent 62a4c9f
commit f7a5a7f
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/src/ui/content/content-ui.js b/src/ui/content/content-ui.js
@@ -222,7 +222,19 @@ function markSelectedContent() {
 				}
 			}
 			if (selectionFound && treeWalker.currentNode == range.endContainer && treeWalker.currentNode.querySelectorAll) {
-				treeWalker.currentNode.querySelectorAll("*").forEach(descendantElement => markSelectedNode(descendantElement));
+				for (
+					let offset = range.startContainer === range.endContainer ? range.startOffset : 0;
+					offset < range.endOffset;
+					offset++
+				) {
+					const node = range.endContainer.childNodes[offset];
+					if (node) {
+						markSelectedNode(node);
+						if (node.querySelectorAll) {
+							node.querySelectorAll("*").forEach(markSelectedNode);
+						}
+					}
+				}
 			}
 		}
 	}