Skip to content

Commit 907aa7f

Browse files
authored
Revert square bracket@main (#553)
reverted replace of square bracket by `get_var`. Problem with `get_var` is as follows.
1 parent ef442f2 commit 907aa7f

9 files changed

+17
-17
lines changed

R/tm_a_pca.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -919,7 +919,7 @@ srv_a_pca <- function(id, data, reporter, filter_panel_api, dat, plot_height, pl
919919
})
920920

921921
plot_r <- reactive({
922-
teal.code::get_var(output_q(), "g")
922+
output_q()[["g"]]
923923
})
924924

925925
pws <- teal.widgets::plot_with_settings_srv(

R/tm_a_regression.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -835,8 +835,8 @@ srv_a_regression <- function(id,
835835
})
836836

837837

838-
fitted <- reactive(teal.code::get_var(output_q(), "fit"))
839-
plot_r <- reactive(teal.code::get_var(output_q(), "g"))
838+
fitted <- reactive(output_q()[["fit"]])
839+
plot_r <- reactive(output_q()[["g"]])
840840

841841
# Insert the plot into a plot_with_settings module from teal.widgets
842842
pws <- teal.widgets::plot_with_settings_srv(

R/tm_g_association.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ srv_tm_g_association <- function(id,
429429

430430
plot_r <- shiny::reactive({
431431
shiny::req(iv_r()$is_valid())
432-
teal.code::get_var(output_q(), "p")
432+
output_q()[["p"]]
433433
})
434434

435435
pws <- teal.widgets::plot_with_settings_srv(
@@ -440,7 +440,7 @@ srv_tm_g_association <- function(id,
440440
)
441441

442442
output$title <- renderText({
443-
teal.code::get_var(output_q(), "title")
443+
teal.code::dev_suppress(output_q()[["title"]])
444444
})
445445

446446
teal.widgets::verbatim_popup_srv(

R/tm_g_bivariate.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ srv_g_bivariate <- function(id,
594594
})
595595

596596
plot_r <- shiny::reactive({
597-
teal.code::get_var(output_q(), "p")
597+
output_q()[["p"]]
598598
})
599599

600600
pws <- teal.widgets::plot_with_settings_srv(

R/tm_g_distribution.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1168,9 +1168,9 @@ srv_distribution <- function(id,
11681168
qenv_final
11691169
})
11701170

1171-
dist_r <- reactive(teal.code::get_var(dist_q(), "g"))
1171+
dist_r <- reactive(dist_q()[["g"]])
11721172

1173-
qq_r <- reactive(teal.code::get_var(qq_q(), "g"))
1173+
qq_r <- reactive(qq_q()[["g"]])
11741174

11751175
output$summary_table <- DT::renderDataTable(
11761176
expr = if (iv_r()$is_valid()) common_q()[["summary_table"]] else NULL,

R/tm_g_response.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ srv_g_response <- function(id,
451451
teal.code::eval_code(qenv, plot_call)
452452
})
453453

454-
plot_r <- reactive(teal.code::get_var(output_q(), "p"))
454+
plot_r <- reactive(output_q()[["p"]])
455455

456456
# Insert the plot into a plot_with_settings module from teal.widgets
457457
pws <- teal.widgets::plot_with_settings_srv(

R/tm_g_scatterplot.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,7 @@ srv_g_scatterplot <- function(id,
893893
teal.code::eval_code(quote(print(p)))
894894
})
895895

896-
plot_r <- reactive(teal.code::get_var(output_q(), "p"))
896+
plot_r <- reactive(output_q()[["p"]])
897897

898898
# Insert the plot into a plot_with_settings module from teal.widgets
899899
pws <- teal.widgets::plot_with_settings_srv(
@@ -911,7 +911,7 @@ srv_g_scatterplot <- function(id,
911911
validate(need(!input$add_density, "Brushing feature is currently not supported when plot has marginal density"))
912912
}
913913

914-
merged_data <- isolate(teal.code::get_var(output_q(), "ANL"))
914+
merged_data <- isolate(output_q()[["ANL"]])
915915

916916
brushed_df <- teal.widgets::clean_brushedPoints(merged_data, plot_brush)
917917
numeric_cols <- names(brushed_df)[

R/tm_missing_data.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@ srv_missing_data <- function(id, data, reporter, filter_panel_api, dataname, par
772772
)
773773
})
774774

775-
summary_plot_r <- reactive(teal.code::get_var(summary_plot_q(), "g"))
775+
summary_plot_r <- reactive(summary_plot_q()[["g"]])
776776

777777
combination_cutoff_q <- reactive({
778778
req(common_code_q())
@@ -938,7 +938,7 @@ srv_missing_data <- function(id, data, reporter, filter_panel_api, dataname, par
938938
)
939939
})
940940

941-
combination_plot_r <- reactive(teal.code::get_var(combination_plot_q(), "g"))
941+
combination_plot_r <- reactive(combination_plot_q()[["g"]])
942942

943943
summary_table_q <- reactive({
944944
req(
@@ -1129,7 +1129,7 @@ srv_missing_data <- function(id, data, reporter, filter_panel_api, dataname, par
11291129
)
11301130
})
11311131

1132-
by_subject_plot_r <- reactive(teal.code::get_var(by_subject_plot_q(), "g"))
1132+
by_subject_plot_r <- reactive(by_subject_plot_q()[["g"]])
11331133

11341134
output$levels_table <- DT::renderDataTable(
11351135
expr = {

R/tm_outliers.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -900,15 +900,15 @@ srv_outliers <- function(id, data, reporter, filter_panel_api, outlier_var,
900900

901901
boxplot_r <- reactive({
902902
teal::validate_inputs(iv_r())
903-
teal.code::get_var(boxplot_q(), "g")
903+
boxplot_q()[["g"]]
904904
})
905905
density_plot_r <- reactive({
906906
teal::validate_inputs(iv_r())
907-
teal.code::get_var(density_plot_q(), "g")
907+
density_plot_q()[["g"]]
908908
})
909909
cumulative_plot_r <- reactive({
910910
teal::validate_inputs(iv_r())
911-
teal.code::get_var(cumulative_plot_q(), "g")
911+
cumulative_plot_q()[["g"]]
912912
})
913913

914914
box_pws <- teal.widgets::plot_with_settings_srv(

0 commit comments

Comments
 (0)