WIP on use_evaluate

Author: gogonzo

R/tm_g_bivariate.R

@@ -553,16 +553,17 @@ srv_g_bivariate <- function(id,
       selector_list = selector_list,
       datasets = data
     )
-    qenv <- reactive({
-      obj <- data()
-      teal.reporter::teal_card(obj) <- append(teal.reporter::teal_card(obj), "# Bivariate Plot", after = 0)
-      teal.code::eval_code(obj, 'library("ggplot2");library("dplyr");library("teal.modules.general")') # nolint quotes
-    })
 
     anl_merged_q <- reactive({
-      req(anl_merged_input())
-      qenv() %>%
-        teal.code::eval_code(as.expression(anl_merged_input()$expr))
+      obj <- data()
+      teal.reporter::teal_card(obj) <- append(teal.reporter::teal_card(obj), "# Bivariate Plot", after = 0)
+      obj |>
+        teal.code::eval_code(
+          c(
+            expression(library(ggplot2), library(dplyr), library(teal.modules.general)),
+            as.expression(anl_merged_input()$expr)
+          )
+        )
     })
 
     merged <- list(

R/utils.R

@@ -306,12 +306,14 @@ srv_decorate_teal_data <- function(id, data, decorators, expr) {
   moduleServer(id, function(input, output, session) {
     decorated_output <- srv_transform_teal_data("inner", data = data, transformators = decorators)
 
+    expr_r <- if (is.reactive(expr)) expr else reactive(expr)
+
     reactive({
       req(decorated_output())
       if (no_expr) {
         decorated_output()
       } else {
-        teal.code::eval_code(decorated_output(), expr)
+        teal.code::eval_code(decorated_output(), expr_r())
       }
     })
   })