pass along a quoted expr that calls func()

Author: cpsievert

R/shiny.R

@@ -48,10 +48,9 @@ renderPlotly <- function(expr, env = parent.frame(), quoted = FALSE) {
   # prepareWidget() makes it possible to pass different non-plotly
   # objects to renderPlotly() (e.g., ggplot2, promises). It also is used 
   # to inform event_data about what events have been registered
-  shiny::installExprFunction(expr, "func", env, quoted)
-  renderFunc <- shinyRenderWidget(
-    plotly:::prepareWidget(func()), plotlyOutput, env, quoted
-  )
+  shiny::installExprFunction(expr, "func", env, quoted, assign.env = env)
+  expr <- quote(plotly:::prepareWidget(func()))
+  renderFunc <- shinyRenderWidget(expr, plotlyOutput, env, quoted)
   # remove 'internal' plotly attributes that are known to cause false
   # positive test results in shinytest (snapshotPreprocessOutput was added 
   # in shiny 1.0.3.9002, but we require >= 1.1)