Account for the fact that element_blank() elements are length 0, but should be considered defined

.github/workflows/R-CMD-check.yaml

@@ -100,14 +100,13 @@ jobs:
       - name: Mac systemdeps
         if: runner.os == 'macOS'
         run: |
-          brew cask install xquartz phantomjs
+          brew install --cask xquartz phantomjs
           brew install pkg-config cairo
 
       # ------------------------------------------------------------
 
       - name: Install dependencies
         run: |
-          install.packages("vctrs")
           remotes::install_deps(dependencies = TRUE)
           remotes::install_cran("rcmdcheck")
         shell: Rscript {0}
@@ -117,8 +116,8 @@ jobs:
       - name: Install testing dependencies
         run: |
           # TODO: remove me after next release cycle
-          remotes::install_github(c('rstudio/rmarkdown#1706', 'rstudio/bslib', 'yixuan/showtext'))
-          install.packages(c('shinytest', 'sf', 'ggthemes', 'patchwork', 'gridExtra', 'tinytex'))
+          remotes::install_github('rstudio/rmarkdown')
+          install.packages(c('shinytest', 'callr', 'sf', 'ggthemes', 'patchwork', 'gridExtra', 'tinytex'))
           tinytex::install_tinytex()
         shell: Rscript {0}
 
@@ -146,16 +145,31 @@ jobs:
           Rscript
           -e "cat('::set-output name=name::gha-', '${{ steps.failed_branch.outputs.name }}', '-', '${{ matrix.config.r }}', '-', '${{ runner.os }}', sep = '')"
 
+
+      # Run test() before R CMD check since, for some reason, rcmdcheck::rcmdcheck() skips vdiffr tests
+      - name: Install devtools
+        run: if (!require(devtools)) install.packages("devtools")
+        shell: Rscript {0}
+      - name: Run Tests
+        run: |
+          devtools::install()
+          res <- devtools::test()
+          df <- as.data.frame(res)
+          if (sum(df$failed) > 0 || any(df$error)) stop("GHA CI tests failed")
+        shell: Rscript {0}
+
+      # Run check with --no-tests since we ran them abve
       - name: Check
-        run: rcmdcheck::rcmdcheck(args = "--no-manual", error_on = "warning", check_dir = "check")
+        run: rcmdcheck::rcmdcheck(args = c("--no-tests", "--no-manual"), error_on = "warning", check_dir = "check")
         shell: Rscript {0}
 
+      # Upload the whole pkg since tests where run with devtools::test()
       - name: Upload check results
         if: failure()
         uses: actions/upload-artifact@master
         with:
           name: ${{ runner.os }}-r${{ matrix.config.r }}-results
-          path: check
+          path: ./
 
       - name: Push test files to a GH branch
         if: failure()
@@ -172,9 +186,6 @@ jobs:
 
           git checkout -B ${{ steps.gha_branch.outputs.name }}
 
-          cp -r check/thematic.Rcheck/tests/figs/* tests/figs/
-          cp -r check/thematic.Rcheck/tests/testthat/* tests/testthat/
-
           git add tests/ && \
             git commit -m 'Add test files - rstudio/thematic@${{ steps.short_sha.outputs.sha }}'
 

.gitignore

@@ -5,9 +5,6 @@ Untitled*
 README.html
 tmp/
 tests/testthat/**/Rplots.pdf
-tests/testthat/*/*/*-current
-tests/testthat/*/*/*/*-current
-tests/testthat/*/*/*/*/*-current
 tests/testthat/testthat-problems.rds
 docs/
 cranwhales/

DESCRIPTION

@@ -37,6 +37,7 @@ Suggests:
     rmarkdown,
     htmltools,
     shiny (>= 1.5.0),
+    bslib,
     testthat,
     vdiffr,
     svglite,

NEWS.md

@@ -1,6 +1,6 @@
 # thematic 0.1.1.9000
 
-
+* Closed #82: Fixed a bug with element_blank() in plot-specific user code not being respected by thematic. (#83) 
 
 # thematic 0.1.1
 

R/auto.R

@@ -202,7 +202,7 @@ auto_resolve_theme <- function(theme) {
 # ------------------------------------------------------------
 
 shiny_output_info <- function() {
-  if (!is_installed("shiny")) return(NULL)
+  if (!"shiny" %in% loadedNamespaces()) return(NULL)
   info <- tryNULL(shiny::getCurrentOutputInfo())
   # Return early if we're not in any output context
   if (is.null(info)) return(NULL)

R/ggplot.R

@@ -269,10 +269,10 @@ resolve_theme_inheritance <- function(p_theme) {
       parent_el <- p_theme[[this_parent]]
       kid_el <- p_theme[[this_kid]]
       # parent doesn't exist so do nothing
-      if (!length(parent_el)) {
+      if (is.null(parent_el)) {
         next
       }
-      p_theme[[this_kid]] <- if (length(kid_el)) {
+      p_theme[[this_kid]] <- if (!is.null(kid_el)) {
         # both parent & child exist
         ggplot2::merge_element(new = kid_el, old = parent_el)
       } else {

tests/testthat/CairoPNG/app.R

@@ -2,10 +2,7 @@ library(shiny)
 library(ggplot2)
 library(thematic)
 
-thematic_on("black", "white", font = font_spec("Pacifico", 1.25, update = TRUE))
-onStop(function() {
-  thematic_off()
-})
+thematic_shiny("black", "white", font = font_spec("Pacifico", 1.25, update = TRUE))
 
 ui <- fluidPage(
   imageOutput("CairoPNG")

tests/testthat/agg_png/app.R

@@ -2,10 +2,7 @@ library(shiny)
 library(ggplot2)
 library(thematic)
 
-thematic_on("black", "white", font = font_spec("Pacifico", 1.25, update = TRUE))
-onStop(function() {
-  thematic_off()
-})
+thematic_shiny("black", "white", font = font_spec("Pacifico", 1.25, update = TRUE))
 
 ui <- fluidPage(
   imageOutput("ragg_png")

tests/testthat/auto_theme_rmd/darkly_rmd/app.R

@@ -22,14 +22,17 @@ image_info <- function(type, ext) {
   )
 }
 
+# Knit all the Rmds
+# Note that this is done inside the server function
+# to avoid a timeout issue with shinytest::testApp()
+infile <- "darkly.Rmd"
+rmd_txt <- knitr::knit_expand("../../template_theme.Rmd", theme = "darkly")
+writeLines(rmd_txt, infile)
+outfile <- rmarkdown::render(infile)
+
+onStop(function() {unlink(infile)})
+
 server <- function(input, output, session) {
-  # Knit all the Rmds
-  # Note that this is done inside the server function
-  # to avoid a timeout issue with shinytest::testApp()
-  infile <- "darkly.Rmd"
-  rmd_txt <- knitr::knit_expand("../../template_theme.Rmd", theme = "darkly")
-  writeLines(rmd_txt, infile)
-  outfile <- rmarkdown::render(infile)
 
   output$ggplot <- render_image(image_info("ggplot", ext))
   output$lattice <- render_image(image_info("lattice", ext))
@@ -38,7 +41,6 @@ server <- function(input, output, session) {
   onFlush(function() {
     unlink(dir(pattern = paste0("\\.", ext)))
     unlink(c(infile, outfile, paste0(tools::file_path_sans_ext(infile), "_files")), recursive = TRUE)
-    unlink(infile)
   })
 }
 

tests/testthat/auto_theme_shiny/base/app.R

@@ -1,8 +1,7 @@
 library(shiny)
 library(thematic)
 
-thematic_on(font = "auto")
-onStop(thematic_off)
+thematic_shiny(font = "auto")
 
 ui <- fluidPage(
   titlePanel("Hello"),

tests/testthat/auto_theme_shiny/lattice/app.R

@@ -1,8 +1,7 @@
 library(shiny)
 library(thematic)
 
-thematic_on(font = "auto")
-onStop(thematic_off)
+thematic_shiny(font = "auto")
 
 ui <- fluidPage(
   titlePanel("Hello"),

tests/testthat/auto_theme_shiny/local_theme/tests/shinytest/mytest-expected-mac/001.json

@@ -7,6 +7,7 @@
       "src": "[image data sha1: 1026f88d673aaff4c59eb9c4de8d56c03550ad20]",
       "width": 962,
       "height": 400,
+      "alt": "Plot object",
       "coordmap": {
         "panels": [
           {
@@ -41,6 +42,7 @@
       "src": "[image data sha1: 2ca44e4a1f6cfe63be8c6f337131c54eff8814cc]",
       "width": 962,
       "height": 400,
+      "alt": "Plot object",
       "coordmap": {
         "panels": [
           {
@@ -75,6 +77,7 @@
       "src": "[image data sha1: 61826ec957b246af522e875b0b499045077aadf0]",
       "width": 962,
       "height": 400,
+      "alt": "Plot object",
       "coordmap": {
         "panels": [
           {

tests/testthat/auto_theme_shiny/with_theme/tests/shinytest/mytest-expected-mac/001.json

@@ -7,6 +7,7 @@
       "src": "[image data sha1: 1026f88d673aaff4c59eb9c4de8d56c03550ad20]",
       "width": 962,
       "height": 400,
+      "alt": "Plot object",
       "coordmap": {
         "panels": [
           {
@@ -41,6 +42,7 @@
       "src": "[image data sha1: 2ca44e4a1f6cfe63be8c6f337131c54eff8814cc]",
       "width": 962,
       "height": 400,
+      "alt": "Plot object",
       "coordmap": {
         "panels": [
           {
@@ -75,6 +77,7 @@
       "src": "[image data sha1: 61826ec957b246af522e875b0b499045077aadf0]",
       "width": 962,
       "height": 400,
+      "alt": "Plot object",
       "coordmap": {
         "panels": [
           {

tests/testthat/cairo_png/app.R

@@ -2,10 +2,7 @@ library(shiny)
 library(ggplot2)
 library(thematic)
 
-thematic_on("black", "white", font = font_spec("Pacifico", 1.25, update = TRUE))
-onStop(function() {
-  thematic_off()
-})
+thematic_shiny("black", "white", font = font_spec("Pacifico", 1.25, update = TRUE))
 
 ui <- fluidPage(
   imageOutput("png")

tests/testthat/cairo_svg/app.R

@@ -2,10 +2,7 @@ library(shiny)
 library(ggplot2)
 library(thematic)
 
-thematic_on("black", "white", font = font_spec("Pacifico", 1.25, update = TRUE))
-onStop(function() {
-  thematic_off()
-})
+thematic_shiny("black", "white", font = font_spec("Pacifico", 1.25, update = TRUE))
 
 ui <- fluidPage(
   imageOutput("svg")

tests/testthat/pdf.Rmd

@@ -4,7 +4,7 @@ output: pdf_document
 
 ```{r}
 library(thematic)
-thematic_on(
+thematic_rmd(
   "#444444", "#e4e4e4", "#749886", 
   font = font_spec("Liu Jian Mao Cao", scale = 1.25, update = TRUE)
 )
@@ -20,9 +20,5 @@ lattice::show.settings()
 ```
 
 ```{r base}
-image(volcano, col = thematic_get_option("sequential"))
-```
-
-```{r}
-thematic_off()
+image(volcano, col = thematic_get_option("sequential", resolve = FALSE))
 ```

tests/testthat/quartz_png/app.R

@@ -2,10 +2,7 @@ library(shiny)
 library(ggplot2)
 library(thematic)
 
-thematic_on("black", "white", font = font_spec("Pacifico", 1.25, update = TRUE))
-onStop(function() {
-  thematic_off()
-})
+thematic_shiny("black", "white", font = font_spec("Pacifico", 1.25, update = TRUE))
 
 ui <- fluidPage(
   imageOutput("quartz")

tests/testthat/shiny_runtime/tests/shinytest/mytest-expected-win/001.json

@@ -4,7 +4,7 @@
   },
   "output": {
     "__reactivedoc__": {
-      "html": "[html data sha1: 66111e7469c463643509cdc78d840b5dbde83aeb]",
+      "html": "[html data sha1: bba70ec94501a4898cb719daf599f07ff70cd290]",
       "deps": [
         {
           "name": "jquery",
@@ -35,7 +35,7 @@
             "shim/respond.min.js"
           ],
           "stylesheet": "css/darkly.min.css",
-          "head": "<style>h1 {font-size: 34px;}\n       h1.title {font-size: 38px;}\n       h2 {font-size: 30px;}\n       h3 {font-size: 24px;}\n       h4 {font-size: 18px;}\n       h5 {font-size: 16px;}\n       h6 {font-size: 12px;}<\/style>",
+          "head": "<style>h1 {font-size: 34px;}\n       h1.title {font-size: 38px;}\n       h2 {font-size: 30px;}\n       h3 {font-size: 24px;}\n       h4 {font-size: 18px;}\n       h5 {font-size: 16px;}\n       h6 {font-size: 12px;}\n       code {color: inherit; background-color: rgba(0, 0, 0, 0.04);}\n       pre:not([class]) { background-color: white }<\/style>",
           "attachment": null,
           "package": null,
           "all_files": true
@@ -68,20 +68,6 @@
           "package": null,
           "all_files": true
         },
-        {
-          "name": "anchor-sections",
-          "version": "1.0.1",
-          "src": {
-            "href": "anchor-sections-1.0.1"
-          },
-          "meta": null,
-          "script": "anchor-sections.js",
-          "stylesheet": "anchor-sections.css",
-          "head": null,
-          "attachment": null,
-          "package": null,
-          "all_files": true
-        },
         {
           "name": "rmarkdown-performance",
           "version": "0.1",
@@ -102,6 +88,7 @@
       "src": "[image data sha1: 89827a2ad6d5cbd1dc0a7742bd06cd75ad50a91c]",
       "width": 910,
       "height": 400,
+      "alt": "Plot object",
       "coordmap": {
         "panels": [
           {

tests/testthat/template_device.Rmd

@@ -12,12 +12,8 @@ knitr::opts_chunk$set(
   fig.path = "./",
   dev = {{device}}
 )
-```
-
-
-```{r}
 library(thematic)
-thematic_on(
+thematic_rmd(
   "#444444", "#e4e4e4", "#749886", 
   font = font_spec("Liu Jian Mao Cao", scale = 1.25, update = TRUE)
 )

tests/testthat/template_theme.Rmd

@@ -12,11 +12,7 @@ knitr::opts_chunk$set(
   echo = FALSE,
   fig.path = "./"
 )
-```
-
-```{r}
-library(thematic)
-thematic_on()
+thematic::thematic_rmd()
 ```
 
 ```{r ggplot}

tests/testthat/test-base.R

@@ -1,8 +1,10 @@
 context("base")
 
-test_that("base baselines", {
 
-  thematic_on("black", "white", "violet", font_spec("Amatic SC", 1.5, update = TRUE))
+test_that("base baselines", {
+  thematic_local_theme(
+    thematic_theme("black", "white", "violet", font_spec("Amatic SC", 1.5, update = TRUE))
+  )
 
   expect_doppelganger("scatter", function() { plot(1:10) })
   expect_doppelganger("scatter-cols", function() { plot(1:10, col = 1:10) })