narrow down screenshot

dataheld · Nov 19, 2024 · 4c38fa7 · 4c38fa7
1 parent 6153b68
commit 4c38fa7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/R/module2app.R b/R/module2app.R
@@ -50,7 +50,10 @@ module2app <- function(module_ui = NULL,
     attributes(res),
     list(
       crow_screenshot_args = list(
-        selector = paste0("#", inner_module_id)
+        # need to select down to child
+        # because only that actually has a height
+        # the parent div may not, and will then fail the screenshot
+        selector = paste0("#", inner_module_id, " > *")
       )
     )
   )
@@ -79,7 +82,7 @@ module2app_ui <- function(module_ui = NULL,
     shiny::h2("Server Input Arguments"),
     mixed_react_tree_ui("inputs"),
     shiny::h2("Module UI"),
-    shiny::wellPanel(
+    shiny::div(
       module_ui(id = "test_object"),
       id = inner_module_id
     ),

diff --git a/tests/testthat/_snaps/mac/shiny2screenshot/counter.png b/tests/testthat/_snaps/mac/shiny2screenshot/counter.png
diff --git a/tests/testthat/_snaps/module2app.md b/tests/testthat/_snaps/module2app.md
@@ -14,7 +14,7 @@
         <h3>Evaluated</h3>
         <pre class="shiny-text-output noplaceholder" id="inputs-eval"></pre>
         <h2>Module UI</h2>
-        <div class="well" id="crow-module2app-module-ui">
+        <div id="crow-module2app-module-ui">
           <div class="bg-info">
             <em>No ui function provided.</em>
           </div>
@@ -42,7 +42,7 @@
         <h3>Evaluated</h3>
         <pre class="shiny-text-output noplaceholder" id="inputs-eval"></pre>
         <h2>Module UI</h2>
-        <div class="well" id="crow-module2app-module-ui">
+        <div id="crow-module2app-module-ui">
           <button id="test_object-button" type="button" class="btn btn-default action-button">Counter</button>
           <pre class="shiny-text-output noplaceholder" id="test_object-out"></pre>
         </div>
@@ -85,7 +85,7 @@
       <h3>Evaluated</h3>
       <pre class="shiny-text-output noplaceholder" id="inputs-eval"></pre>
       <h2>Module UI</h2>
-      <div class="well" id="crow-module2app-module-ui">
+      <div id="crow-module2app-module-ui">
         <button id="test_object-button" type="button" class="btn btn-default action-button">Counter</button>
         <pre class="shiny-text-output noplaceholder" id="test_object-out"></pre>
       </div>

diff --git a/tests/testthat/test-module2app.R b/tests/testthat/test-module2app.R
@@ -140,7 +140,7 @@ test_that("works with bs5", {
     )
   )
 })
-correct_attr <- list(selector = paste0("#", inner_module_id))
+correct_attr <- list(selector = paste0("#", inner_module_id, " > *"))
 test_that("returns attribute with dom selector", {
   expect_equal(
     attr(module2app(counter_button_ui), "crow_screenshot_args"),