fix example_module, remove deprecated teal_data() calls

R/dummy_functions.R

@@ -79,8 +79,8 @@ example_datasets <- function() { # nolint
 #' @examples
 #' app <- init(
 #'   data = teal_data(
-#'     dataset("IRIS", iris),
-#'     dataset("MTCARS", mtcars)
+#'     IRIS = iris,
+#'     MTCARS = mtcars
 #'   ),
 #'   modules = example_module()
 #' )
@@ -92,27 +92,32 @@ example_module <- function(label = "example teal module", datanames = "all") {
   checkmate::assert_string(label)
   module(
     label,
+    ui = function(id) {
+      ns <- NS(id)
+      teal.widgets::standard_layout(
+        output = dataTableOutput(ns("table")),
+        encoding = div(
+          selectInput(ns("dataname"), "Choose a dataset", choices = NULL),
+          teal.widgets::verbatim_popup_ui(ns("rcode"), "Show R code")
+        )
+      )
+    },
     server = function(id, data) {
-      checkmate::assert_class(data, "tdata")
+      checkmate::assert_class(data, "reactive")
       moduleServer(id, function(input, output, session) {
-        output$text <- renderPrint(data[[input$dataname]]())
+        observeEvent(data(), {
+          updateSelectInput(session, "dataname", choices = teal.data::datanames(data()))
+        })
+
+        output$table <- renderDataTable(data()[[input$dataname]])
+
         teal.widgets::verbatim_popup_srv(
           id = "rcode",
-          verbatim_content = attr(data, "code")(),
+          verbatim_content = reactive(teal.code::get_code(data())),
           title = "Association Plot"
         )
       })
     },
-    ui = function(id, data) {
-      ns <- NS(id)
-      teal.widgets::standard_layout(
-        output = verbatimTextOutput(ns("text")),
-        encoding = div(
-          selectInput(ns("dataname"), "Choose a dataset", choices = names(data)),
-          teal.widgets::verbatim_popup_ui(ns("rcode"), "Show R code")
-        )
-      )
-    },
     datanames = datanames
   )
 }

R/init.R

@@ -54,13 +54,10 @@
 #' @include modules.R
 #'
 #' @examples
-#' new_iris <- transform(iris, id = seq_len(nrow(iris)))
-#' new_mtcars <- transform(mtcars, id = seq_len(nrow(mtcars)))
-#'
 #' app <- init(
 #'   data = teal_data(
-#'     dataset("new_iris", new_iris),
-#'     dataset("new_mtcars", new_mtcars),
+#'     new_iris = transform(iris, id = seq_len(nrow(iris))),
+#'     new_mtcars = transform(mtcars, id = seq_len(nrow(mtcars))),
 #'     code = "
 #'       new_iris <- transform(iris, id = seq_len(nrow(iris)))
 #'       new_mtcars <- transform(mtcars, id = seq_len(nrow(mtcars)))
@@ -78,7 +75,7 @@
 #'       "Iris Sepal.Length histogram",
 #'       server = function(input, output, session, data) {
 #'         output$hist <- renderPlot(
-#'           hist(data[["new_iris"]]()$Sepal.Length)
+#'           hist(data()[["new_iris"]]$Sepal.Length)
 #'         )
 #'       },
 #'       ui = function(id, ...) {

R/modules.R

@@ -22,7 +22,7 @@
 #' library(shiny)
 #'
 #' app <- init(
-#'   data = teal_data(dataset("iris", iris)),
+#'   data = teal_data(iris = iris),
 #'   modules = modules(
 #'     label = "Modules",
 #'     modules(
@@ -199,7 +199,7 @@ is_arg_used <- function(modules, arg) {
 #' library(shiny)
 #'
 #' app <- init(
-#'   data = teal_data(dataset("iris", iris)),
+#'   data = teal_data(iris = iris),
 #'   modules = list(
 #'     module(
 #'       label = "Module",