cleanup

fix defaults

Author: gogonzo

DESCRIPTION

@@ -31,7 +31,6 @@ Depends:
 Imports:
     bslib (>= 0.8.0),
     checkmate (>= 2.1.0),
-    colorspace,
     colourpicker (>= 1.3.0),
     dplyr (>= 1.0.5),
     DT (>= 0.13),
@@ -42,20 +41,14 @@ Imports:
     ggpp (>= 0.5.8-1),
     ggrepel (>= 0.9.6),
     goftest (>= 1.2-3),
-    graphics,
-    grDevices,
     grid,
     gridExtra (>= 2.3),
-    htmltools,
     htmlwidgets (>= 1.6.4),
     jsonlite (>= 1.8.9),
     lattice (>= 0.18-4),
     lifecycle (>= 0.2.0),
     MASS (>= 7.3-60),
-    plotly,
-    reactable,
-    rlang (>= 1.0.0),
-    rmarkdown (>= 2.23),
+    rlang,
     rtables (>= 0.6.11),
     scales (>= 1.3.0),
     shinyjs (>= 2.1.0),

NAMESPACE

@@ -42,7 +42,6 @@ export(tm_g_scatterplotmatrix)
 export(tm_missing_data)
 export(tm_outliers)
 export(tm_t_crosstable)
-export(tm_t_reactables)
 export(tm_variable_browser)
 import(ggplot2)
 import(shiny)

R/module_colur_picker.R

@@ -32,17 +32,15 @@ tm_g_scatterplot.picks <- function(label = "Scatterplot",
                                      teal.transform::datasets(),
                                      teal.transform::variables(
                                        choices = teal.transform::is_categorical(min.len = 2, max.len = 10),
-                                       selected = NULL,
-                                       multiple = TRUE
+                                       selected = NULL
                                      ),
                                      teal.transform::values()
                                    ),
                                    col_facet = teal.transform::picks(
                                      teal.transform::datasets(),
                                      teal.transform::variables(
                                        choices = teal.transform::is_categorical(min.len = 2, max.len = 10),
-                                       selected = NULL,
-                                       multiple = TRUE
+                                       selected = NULL
                                      ),
                                      teal.transform::values()
                                    ),

R/tm_g_scatterplot_picks.R

@@ -12,7 +12,7 @@ tm_t_crosstable.picks <- function(label = "Cross Table",
                                     teal.transform::datasets(),
                                     teal.transform::variables(
                                       choices = teal.transform::is_categorical(min.len = 2, max.len = 10),
-                                      selected = 2L, multiple = TRUE, ordered = TRUE
+                                      selected = 2L, ordered = TRUE
                                     ),
                                     teal.transform::values()
                                   ),
@@ -147,7 +147,7 @@ srv_t_crosstable.picks <- function(id, data, label, x, y, remove_zero_columns, b
         selectors$y()
       },
       handlerExpr = {
-        if (identical(selectors$x()$datasets$selected, selectors$x()$datasets$selected)) {
+        if (identical(selectors$x()$datasets$selected, selectors$y()$datasets$selected)) {
           shinyjs::hide("join_fun")
         } else {
           shinyjs::show("join_fun")
@@ -160,7 +160,7 @@ srv_t_crosstable.picks <- function(id, data, label, x, y, remove_zero_columns, b
       data = validated_q,
       selectors = selectors,
       output_name = "anl",
-      join_fun = input$join_fun # todo: make reactive
+      join_fun = isolate(input$join_fun) # todo: make reactive
     )
 
     output_q <- reactive({