manipulateWidget now returns an uninitialized controller in non inter…

…active situations

R/controller.R

@@ -73,6 +73,7 @@ MWController <- setRefClass(
 
     init = function() {
       if (!initialized) {
+        initialized <<- TRUE
         inputList$init()
         updateCharts()
         if (is.null(renderFunc) || is.null(outputFunc) || is.null(useCombineWidgets)) {
@@ -112,6 +113,7 @@ MWController <- setRefClass(
       "Update the value of a variable for a given chart."
       oldValue <- getValue(name, chartId)
       newValue <- inputList$setValue(name, value, chartId)
+      if (!initialized) return()
       if (autoUpdate && !isTRUE(all.equal(oldValue, newValue))) {
         if (inputList$isShared(name)) updateCharts()
         else updateChart(chartId)
@@ -121,6 +123,7 @@ MWController <- setRefClass(
     setValueById = function(id, value) {
       oldValue <- getValueById(id)
       newValue <- inputList$setValue(inputId = id, value = value)
+      if (!initialized) return()
       if (autoUpdate && !isTRUE(all.equal(oldValue, newValue))) {
         if (grepl("^shared_", id)) updateCharts()
         else {
@@ -268,5 +271,6 @@ cloneEnv <- function(env, parentEnv = parent.env(env)) {
 #'
 #' @export
 knit_print.MWController <- function(x, ...) {
+  x$init()
   knitr::knit_print(x$returnCharts(), ...)
 }

R/manipulate_widget.R

@@ -257,13 +257,13 @@ manipulateWidget <- function(.expr, ..., .updateBtn = FALSE, .saveBtn = TRUE,
   controller <- MWController(.expr, inputs, autoUpdate = !.updateBtn,
                            nrow = dims$nrow, ncol = dims$ncol,
                            returnFunc = .return)
-  controller$init()
-
-  mwModuleInput <- controller$getModuleUI(gadget = !isRuntimeShiny, saveBtn = .saveBtn)
-  mwModule <- controller$getModuleServer()
 
   if (.runApp & interactive()) {
     # We are in an interactive session so we start a shiny gadget
+    controller$init()
+    mwModuleInput <- controller$getModuleUI(gadget = TRUE, saveBtn = .saveBtn)
+    mwModule <- controller$getModuleServer()
+
     .viewer <- switch(
       .viewer,
       pane = shiny::paneViewer(),
@@ -279,6 +279,10 @@ manipulateWidget <- function(.expr, ..., .updateBtn = FALSE, .saveBtn = TRUE,
     shiny::runGadget(ui, server, viewer = .viewer)
   } else if (.runApp & isRuntimeShiny) {
     # We are in Rmarkdown document with shiny runtime. So we start a shiny app
+    controller$init()
+    mwModuleInput <- controller$getModuleUI(gadget = FALSE, saveBtn = .saveBtn)
+    mwModule <- controller$getModuleServer()
+
     ui <- mwModuleInput("ui", height = "100%")
     server <- function(input, output, session, ...) {
       controller <- shiny::callModule(mwModule, "ui")

tests/testthat/test-controller.R

@@ -61,4 +61,19 @@ describe("MWController", {
     expect_is(server, "function")
     expect_equal(names(formals(server)), c("input", "output", "session", "..."))
   })
+
+  it("does not update values or create charts until it is initialized", {
+    inputs <- initInputs(list(x = mwSlider(0, 10, 5), y = mwSlider(x, 10, 0)))
+    expr <- expression(paste(x, y))
+    controller <- MWController(expr, inputs)
+    expect_length(controller$charts, 0)
+    expect_equal(controller$getValue("y"), 0)
+    controller$setValue("x", 3)
+    expect_length(controller$charts, 0)
+    expect_equal(controller$getValue("y"), 0)
+    controller$init()
+    expect_length(controller$charts, 1)
+    expect_equal(controller$charts[[1]]$widgets[[1]], "3 3")
+    expect_equal(controller$getValue("y"), 3)
+  })
 })

tests/testthat/test-manipulate_widget.R

@@ -1,13 +1,24 @@
 context("manipulateWidget")
 
 describe("manipulateWidget", {
+  it("returns an uninitialized MWController in a non interactive situation", {
+    c <- manipulateWidget(
+      paste(a, b),
+      a = mwSelect(c("a", "b", "c")),
+      b = mwText("test"),
+      .compare = "a"
+    )
+    expect_true(!c$initialized)
+  })
+
   it("creates two charts when .compare is a character vector", {
     c <- manipulateWidget(
       paste(a, b),
       a = mwSelect(c("a", "b", "c")),
       b = mwText("test"),
       .compare = "a"
     )
+    c$init()
     expect_equal(c$ncharts, 2)
     expect_equal(c$getValue("a", 1), "a")
     expect_equal(c$getValue("a", 2), "a")
@@ -20,6 +31,7 @@ describe("manipulateWidget", {
       b = mwText("test"),
       .compare = list(a = NULL)
     )
+    c$init()
     expect_equal(c$ncharts, 2)
     expect_equal(c$getValue("a", 1), "a")
     expect_equal(c$getValue("a", 2), "a")
@@ -32,6 +44,7 @@ describe("manipulateWidget", {
       b = mwText("test"),
       .compare = list(a = list("a", "b"))
     )
+    c$init()
     expect_equal(c$ncharts, 2)
     expect_equal(c$getValue("a", 1), "a")
     expect_equal(c$getValue("a", 2), "b")
@@ -47,6 +60,7 @@ describe("manipulateWidget", {
       .compare = list(a = list("a", "b", "c")),
       .compareOpts = compareOptions(ncharts = 3)
     )
+    c$init()
     expect_equal(c$ncharts, 3)
     expect_equal(c$getValue("a", 1), "a")
     expect_equal(c$getValue("a", 2), "b")
@@ -62,6 +76,7 @@ describe("manipulateWidget", {
       x = mwSlider(0, 10, 5),
       y = mwSlider(0, x, 4)
     )
+    c$init()
     expect_equal(c$getParams("y")$max, 5)
     c$setValue("x", 3)
     expect_equal(c$getParams("y")$max, 3)
@@ -74,6 +89,7 @@ describe("manipulateWidget", {
       x = mwSlider(0, 10, 0),
       y = mwSlider(0, 10, 0, .display = x < 5)
     )
+    c$init()
     expect_true(c$isVisible("y"))
     c$setValue("x", 6)
     expect_true(!c$isVisible("y"))
@@ -86,6 +102,7 @@ describe("manipulateWidget", {
       x2 = mwSharedValue(x * 2),
       y = mwSlider(0, x2, 0)
     )
+    c$init()
     expect_equal(c$getParams("y")$max, 10)
     expect_equal(c$charts[[1]]$widgets[[1]], 10)
     c$setValue("x", 8)
@@ -103,6 +120,7 @@ describe("manipulateWidget", {
       x3 = mwSharedValue(x + x2),
       y = mwSlider(0, x2, 0)
     )
+    c$init()
     expect_equal(c$getParams("y")$max, 1)
     expect_equal(c$charts[[1]]$widgets[[1]], 1)
     c$setValue("x2", 8)