Merged origin/main into luisDVA-rep-base_pipes

hadley · hadley · commit 12e4b75aef3a · 2025-08-20T15:59:55.000-05:00
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -22,7 +22,7 @@ Imports:
     rlang (>= 1.1.0),
     selectr,
     tibble,
-    xml2 (>= 1.3)
+    xml2 (>= 1.4.0)
 Suggests:
     chromote,
     covr,
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,7 @@
 # rvest (development version)
 
+* Fixes `LiveHTML` objects returning 'could not find node with given id' errors if a page navigation occurred after a `$click()` event (#405).
+
 * New example vignette displays the same starwars data but rendered dynamically using JS, so you need to use `read_html_live()` to get the data.
 
 # rvest 1.0.4
diff --git a/R/live.R b/R/live.R
@@ -91,8 +91,6 @@ LiveHTML <- R6::R6Class(
       p <- self$session$Page$loadEventFired(wait_ = FALSE)
       self$session$Page$navigate(url, wait_ = FALSE)
       self$session$wait_for(p)
-
-      private$root_id <- self$session$DOM$getDocument(0)$root$nodeId
     },
 
     #' @description Called when `print()`ed
@@ -202,7 +200,7 @@ LiveHTML <- R6::R6Class(
 
       # https://developer.mozilla.org/en-US/docs/Web/API/Element/scrollTo
       private$call_node_method(
-        private$root_id,
+        private$root_id(),
         paste0(".documentElement.scrollTo(", left, ", ", top, ")")
       )
       invisible(self)
@@ -262,8 +260,9 @@ LiveHTML <- R6::R6Class(
   ),
 
   private = list(
-    root_id = NULL,
-
+    root_id = function() {
+      self$session$DOM$getDocument()$root$nodeId
+    },
     finalize = function() {
       self$session$close()
     },
@@ -272,7 +271,6 @@ LiveHTML <- R6::R6Class(
       if (new_chromote && !self$session$is_active()) {
         suppressMessages({
           self$session <- self$session$respawn()
-          private$root_id <- self$session$DOM$getDocument(0)$root$nodeId
         })
       }
     },
@@ -293,7 +291,7 @@ LiveHTML <- R6::R6Class(
     find_nodes = function(css, xpath) {
       check_exclusive(css, xpath)
       if (!missing(css)) {
-        unlist(self$session$DOM$querySelectorAll(private$root_id, css)$nodeIds)
+        unlist(self$session$DOM$querySelectorAll(private$root_id(), css)$nodeIds)
       } else {
         search <- glue::glue("
           (function() {{
diff --git a/tests/testthat/html/navigate1.html b/tests/testthat/html/navigate1.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Navigate 1</title>
+</head>
+<body>
+  <a href="navigate2.html">Navigate to Page 2</a>
+</body>
diff --git a/tests/testthat/html/navigate2.html b/tests/testthat/html/navigate2.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Navigate 2</title>
+</head>
+<body>
+  <p>Success!</p>
+</body>
diff --git a/tests/testthat/test-live.R b/tests/testthat/test-live.R
@@ -88,6 +88,13 @@ test_that("can press special keys",{
   expect_equal(html_text(html_element(sess, "#keyInfo")), "]/BracketRight")
 })
 
+test_that("can find elements after click that navigates", {
+  skip_if_no_chromote()
+
+  sess <- read_html_live(html_test_path("navigate1"))
+  sess$click("a")
+  expect_equal(html_text2(html_element(sess, "p")), "Success!")
+})
 
 # as_key_desc -------------------------------------------------------------
 
