encapsulate brushing functionality

Author: gogonzo

R/module_brush_filter.R

@@ -1,7 +1,12 @@
 ui_brush_filter <- function(id) {
   ns <- NS(id)
   div(
-    uiOutput(ns("brush_filter")),
+    tags$h1(id = ns("title"), tags$strong("Selected points:"), class = "text-center font-150p"),
+    teal.widgets::get_dt_rows(ns("data_table"), ns("data_table_rows")),
+    div(
+      actionButton(ns("apply_brush_filter"), "Apply filter"),
+      actionButton(ns("remove_brush_filter"), "Remove applied filter")
+    ),
     DT::dataTableOutput(ns("data_table"), width = "100%")
   )
 }
@@ -10,19 +15,36 @@ srv_brush_filter <- function(id, brush, data, filter_panel_api, selectors, table
   moduleServer(id, function(input, output, session) {
     selector_list <- isolate(selectors())
 
-    output$brush_filter <- renderUI({
-      states <- get_filter_state(filter_panel_api)
+    observeEvent(brush(), ignoreNULL = FALSE, {
+      if (is.null(brush())) {
+        shinyjs::hide("title")
+        shinyjs::hide("apply_brush_filter")
+        shinyjs::hide("data_table")
+      } else {
+        shinyjs::show("title")
+        shinyjs::show("apply_brush_filter")
+        shinyjs::show("data_table")
+      }
+    })
+
+    states_list <- reactive({
+      as.list(get_filter_state(filter_panel_api))
+    })
+
+    observeEvent(states_list(), {
       brushed_states <- Filter(
         function(state) state$id == "brush_filter",
-        states
+        states_list()
       )
-      if (!is.null(brush())) {
-        actionButton(session$ns("apply_brush_filter"), "Apply filter")
-      } else if (length(brushed_states)) {
-        actionButton(session$ns("remove_brush_filter"), "Remove applied filter")
+      if (length(brushed_states)) {
+        shinyjs::show("remove_brush_filter")
+      } else {
+        shinyjs::hide("remove_brush_filter")
       }
     })
 
+
+
     observeEvent(input$remove_brush_filter, {
       remove_filter_state(
         filter_panel_api,

R/tm_g_scatterplot.R

@@ -341,8 +341,6 @@ ui_g_scatterplot <- function(id, ...) {
     teal.widgets::standard_layout(
       output = teal.widgets::white_small_well(
         teal.widgets::plot_with_settings_ui(id = ns("scatter_plot")),
-        tags$h1(tags$strong("Selected points:"), class = "text-center font-150p"),
-        teal.widgets::get_dt_rows(ns("data_table"), ns("data_table_rows")),
         ui_brush_filter(ns("brush_filter"))
       ),
       encoding = tags$div(