HTMLBlock as ContentBlock

R/ContentBlock.R

@@ -8,22 +8,9 @@
 ContentBlock <- R6::R6Class( # nolint: object_name_linter.
   classname = "ContentBlock",
   public = list(
-    #' @description Initialize a `ContentBlock` object.
-    #'
-    #' @details Returns a `ContentBlock` object with no content and the default style.
-    #'
-    #' @return Object of class `ContentBlock`, invisibly.
-    #' @examples
-    #' ContentBlock <- getFromNamespace("ContentBlock", "teal.reporter")
-    #' ContentBlock$new()
-    #'
-    initialize = function() {
-      private$content <- character(0)
-      invisible(self)
-    },
     #' @description Sets content of this `ContentBlock`.
     #'
-    #' @param content (`character(0)` or `character(1)`) string or file path assigned to this `ContentBlock`
+    #' @param content (`any`) R object
     #'
     #' @return `self`, invisibly.
     #' @examples
@@ -32,13 +19,12 @@ ContentBlock <- R6::R6Class( # nolint: object_name_linter.
     #' block$set_content("Base64 encoded picture")
     #'
     set_content = function(content) {
-      checkmate::assert_character(content, min.len = 0, max.len = 1)
       private$content <- content
       invisible(self)
     },
     #' @description Retrieves the content assigned to this block.
     #'
-    #' @return `character` string or file path assigned to this `ContentBlock`.
+    #' @return object stored in a `private$content` field
     #' @examples
     #' ContentBlock <- getFromNamespace("ContentBlock", "teal.reporter")
     #' block <- ContentBlock$new()
@@ -64,7 +50,7 @@ ContentBlock <- R6::R6Class( # nolint: object_name_linter.
     }
   ),
   private = list(
-    content = character(0),
+    content = NULL, # this can be any R object
     # @description The copy constructor.
     #
     # @param name (`character(1)`) the name of the field

R/FileBlock.R

@@ -56,6 +56,9 @@ FileBlock <- R6::R6Class( # nolint: object_name_linter.
       list(basename = base_name)
     }
   ),
+  private = list(
+    content = character(0)
+  ),
   lock_objects = TRUE,
   lock_class = TRUE
 )

R/HTMLBlock.R

@@ -8,7 +8,7 @@
 #' @keywords internal
 HTMLBlock <- R6::R6Class( # nolint: object_name_linter.
   classname = "HTMLBlock",
-  inherit = FileBlock,
+  inherit = ContentBlock,
   public = list(
     #' @description Initialize a `HTMLBlock` object.
     #'
@@ -18,30 +18,45 @@ HTMLBlock <- R6::R6Class( # nolint: object_name_linter.
     #' @return Object of class `HTMLBlock`, invisibly.
     initialize = function(content) {
       if (!missing(content)) {
-        checkmate::assert_multi_class(content, c("shiny.tag", "shiny.tag.list", "htmlwidget"))
+        checkmate::assert_multi_class(content, private$supported_types)
         self$set_content(content)
       }
       invisible(self)
     },
-    #' @description Sets content of this `HTMLBlock`.
+
+    #' @description Create the `HTMLBlock` from a list.
     #'
-    #' @param content An object that can be rendered as a HTML content
-    #' assigned to this `HTMLBlock`
+    #' @param x (`named list`) with a single field `content` containing `shiny.tag`,
+    #' `shiny.tag.list` or `htmlwidget`.
     #'
     #' @return `self`, invisibly.
     #' @examples
     #' HTMLBlock <- getFromNamespace("HTMLBlock", "teal.reporter")
     #' block <- HTMLBlock$new()
-    #' block$set_content(shiny::div("HTML Content"))
+    #' block$from_list(list(content = shiny::tags$div("test")))
     #'
-    set_content = function(content) {
-      path <- tempfile(fileext = ".rds")
-      saveRDS(content, file = path)
-      super$set_content(path)
+    from_list = function(x) {
+      checkmate::assert_list(x, types = private$supported_types)
+      checkmate::assert_names(names(x), must.include = "content")
+      self$set_content(x$content)
       invisible(self)
+    },
+
+    #' @description Convert the `HTMLBlock` to a list.
+    #'
+    #' @return `named list` with a text and style.
+    #' @examples
+    #' HTMLBlock <- getFromNamespace("HTMLBlock", "teal.reporter")
+    #' block <- HTMLBlock$new(shiny::tags$div("test"))
+    #' block$to_list()
+    #'
+    to_list = function() {
+      list(content = self$get_content())
     }
   ),
-  private = list(),
+  private = list(
+    supported_types = c("shiny.tag", "shiny.tag.list", "htmlwidget")
+  ),
   lock_objects = TRUE,
   lock_class = TRUE
 )

R/Previewer.R

@@ -320,7 +320,7 @@ block_to_html <- function(b) {
   } else if (inherits(b, "NewpageBlock")) {
     shiny::tags$br()
   } else if (inherits(b, "HTMLBlock")) {
-    readRDS(b_content)
+    b_content
   } else {
     stop("Unknown block class")
   }

R/RcodeBlock.R

@@ -21,10 +21,25 @@ RcodeBlock <- R6::R6Class( # nolint: object_name_linter.
     #' block <- RcodeBlock$new()
     #'
     initialize = function(content = character(0), ...) {
+      checkmate::assert_class(content, "character")
       super$set_content(content)
       self$set_params(list(...))
       invisible(self)
     },
+    #' @description Sets content of this `RcodeBlock`.
+    #'
+    #' @param content (`any`) R object
+    #'
+    #' @return `self`, invisibly.
+    #' @examples
+    #' RcodeBlock <- getFromNamespace("RcodeBlock", "teal.reporter")
+    #' block <- RcodeBlock$new()
+    #' block$set_content("a <- 1")
+    #'
+    set_content = function(content) {
+      checkmate::assert_string(content)
+      super$set_content(content)
+    },
     #' @description Sets the parameters of this `RcodeBlock`.
     #'
     #' @details Configures `rmarkdown` chunk parameters for the `R` code block,
@@ -97,6 +112,7 @@ RcodeBlock <- R6::R6Class( # nolint: object_name_linter.
     }
   ),
   private = list(
+    content = character(0),
     params = list()
   ),
   lock_objects = TRUE,

R/Renderer.R

@@ -86,7 +86,6 @@ Renderer <- R6::R6Class( # nolint: object_name_linter.
         c("TextBlock", "PictureBlock", "NewpageBlock", "TableBlock", "RcodeBlock", "HTMLBlock")
       )
       checkmate::assert_subset(names(global_knitr), names(knitr::opts_chunk$get()))
-
       if (missing(yaml_header)) {
         yaml_header <- md_header(yaml::as.yaml(list(title = "Report")))
       }
@@ -282,9 +281,9 @@ Renderer <- R6::R6Class( # nolint: object_name_linter.
       sprintf("```{r echo = FALSE}\nreadRDS('%s')\n```", basename_table)
     },
     htmlBlock2md = function(block) {
-      basename_content <- basename(block$get_content())
-      file.copy(block$get_content(), file.path(private$output_dir, basename_content))
-      sprintf("```{r echo = FALSE}\nreadRDS('%s')\n```", basename_content)
+      basename <- basename(tempfile(fileext = ".rds"))
+      suppressWarnings(saveRDS(block$get_content(), file = file.path(private$output_dir, basename)))
+      sprintf("```{r echo = FALSE}\nreadRDS('%s')\n```", basename)
     }
   ),
   lock_objects = TRUE,

R/TextBlock.R

@@ -27,6 +27,20 @@ TextBlock <- R6::R6Class( # nolint: object_name_linter.
       self$set_style(style)
       invisible(self)
     },
+    #' @description Sets content of this `TextBlock`.
+    #'
+    #' @param content (`any`) R object
+    #'
+    #' @return `self`, invisibly.
+    #' @examples
+    #' ContentBlock <- getFromNamespace("ContentBlock", "teal.reporter")
+    #' block <- ContentBlock$new()
+    #' block$set_content("Base64 encoded picture")
+    #'
+    set_content = function(content) {
+      checkmate::assert_string(content)
+      super$set_content(content)
+    },
     #' @description Sets the style of this `TextBlock`.
     #'
     #' @details The style has bearing on the rendering of this block.
@@ -96,6 +110,7 @@ TextBlock <- R6::R6Class( # nolint: object_name_linter.
     }
   ),
   private = list(
+    content = character(0),
     style = character(0),
     styles = c("default", "header2", "header3", "verbatim")
   ),