Merge branch '1187_decorate_output@main' into tm_scatterplot@1187_dec…

…orate_output@main

R/tm_g_distribution.R

@@ -913,10 +913,7 @@ srv_distribution <- function(id,
         teal.code::eval_code(
           qenv,
           substitute(
-            expr = {
-              plot <- plot_call
-              print(plot)
-            },
+            expr = plot <- plot_call,
             env = list(plot_call = Reduce(function(x, y) call("+", x, y), c(plot_call, parsed_ggplot2_args)))
           )
         )
@@ -1045,10 +1042,7 @@ srv_distribution <- function(id,
         teal.code::eval_code(
           qenv,
           substitute(
-            expr = {
-              plot <- plot_call
-              print(plot)
-            },
+            expr = plot <- plot_call,
             env = list(plot_call = Reduce(function(x, y) call("+", x, y), c(plot_call, parsed_ggplot2_args)))
           )
         )
@@ -1242,18 +1236,22 @@ srv_distribution <- function(id,
     output_dist_q <- reactive(c(output_common_q(), req(dist_q())))
     output_qq_q <- reactive(c(output_common_q(), req(qq_q())))
 
-    decorated_output_dist_q <- srv_transform_teal_data(
+    decorated_output_dist_q_no_print <- srv_transform_teal_data(
       "d_dist",
       data = output_dist_q,
       transformators = decorators
     )
 
-    decorated_output_qq_q <- srv_transform_teal_data(
+    decorated_output_dist_q <- reactive(within(req(decorated_output_dist_q_no_print()), expr = print(plot)))
+
+    decorated_output_qq_q_no_print <- srv_transform_teal_data(
       "d_qq",
       data = output_qq_q,
       transformators = decorators
     )
 
+    decorated_output_qq_q <- reactive(within(req(decorated_output_qq_q_no_print()), expr = print(plot)))
+
     decorated_output_q <- reactive({
       tab <- req(input$tabs) # tab is NULL upon app launch, hence will crash without this statement
       if (tab == "Histogram") {