Style2@174 checkbox counts@filter panel refactor@main (#199)

thanks @asbates

---------

Co-authored-by: Andrew Bates <andrew.bates@atorusresearch.com>

Author: gogonzo

R/FilterState.R

@@ -535,11 +535,13 @@ FilterState <- R6::R6Class( # nolint
           uiOutput(ns("empty"), inline = TRUE),
           checkboxInput(
             inputId = ns("value"),
-            label = countLabel(
-              inputId = ns("count_label"),
-              label = "Keep NA",
-              countmax = countmax,
-              countnow = countnow
+            label = tags$span(
+              id = ns("count_label"),
+              make_count_text(
+                label = "Keep NA",
+                countmax = countmax,
+                countnow = countnow
+              )
             ),
             value = isolate(self$get_keep_na())
           )
@@ -561,7 +563,7 @@ FilterState <- R6::R6Class( # nolint
         #  and if the reactive changes - reactive triggers only if the output is visible.
         # 2. We want to trigger change of the labels only if reactive count changes (not underlying data)
         output$empty <- renderUI({
-          updateCountLabel(
+          updateCountText(
             inputId = "count_label",
             label = "Keep NA",
             countmax = private$na_count,

R/FilterStateChoices.R

@@ -205,7 +205,7 @@ ChoicesFilterState <- R6::R6Class( # nolint
       countsnow <- isolate(unname(table(factor(private$x_reactive(), levels = private$choices))))
 
       ui_input <- if (private$is_checkboxgroup()) {
-        labels <- countBarLabels(
+        labels <- countBars(
           inputId = ns("labels"),
           choices = as.character(private$choices),
           countsnow = countsnow,
@@ -271,7 +271,7 @@ ChoicesFilterState <- R6::R6Class( # nolint
               private$dataname
             ))
             if (private$is_checkboxgroup()) {
-              updateCountBarLabels(
+              updateCountBars(
                 inputId = "labels",
                 choices = as.character(private$choices),
                 countsmax = as.numeric(names(private$choices)),

R/FilterStateLogical.R

@@ -179,7 +179,7 @@ LogicalFilterState <- R6::R6Class( # nolint
       countsmax <- as.numeric(names(private$choices))
       countsnow <- isolate(unname(table(factor(private$x_reactive(), levels = private$choices))))
 
-      labels <- countBarLabels(
+      labels <- countBars(
         inputId = ns("labels"),
         choices = as.character(private$choices),
         countsnow = countsnow,
@@ -222,7 +222,7 @@ LogicalFilterState <- R6::R6Class( # nolint
               private$varname,
               private$dataname
             ))
-            updateCountBarLabels(
+            updateCountBars(
               inputId = "labels",
               choices = as.character(private$choices),
               countsmax = as.numeric(names(private$choices)),

R/FilterStateRange.R

@@ -434,11 +434,13 @@ RangeFilterState <- R6::R6Class( # nolint
           uiOutput(ns("empty"), inline = TRUE),
           checkboxInput(
             inputId = ns("value"),
-            label = countLabel(
-              inputId = ns("count_label"),
-              label = "Keep Inf",
-              countmax = countmax,
-              countnow = countnow
+            label = tags$span(
+              id = ns("count_label"),
+              make_count_text(
+                label = "Keep Inf",
+                countmax = countmax,
+                countnow = countnow
+              )
             ),
             value = isolate(self$get_keep_inf())
           )
@@ -461,7 +463,7 @@ RangeFilterState <- R6::R6Class( # nolint
         #  and if the reactive changes - reactive triggers only if the output is visible.
         # 2. We want to trigger change of the labels only if reactive count changes (not underlying data)
         output$empty <- renderUI({
-          updateCountLabel(
+          updateCountText(
             inputId = "count_label",
             label = "Keep Inf",
             countmax = private$inf_count,

R/count_labels.R

@@ -19,7 +19,7 @@
 #'
 #' choices <- sample(as.factor(c("a", "b", "c")), size = 20, replace = TRUE)
 #' counts <- table(choices)
-#' labels <- countBarLabels(
+#' labels <- countBars(
 #'   inputId = "counts",
 #'   choices = c("a", "b", "c"),
 #'   countsmax = c(20, 20, 20),
@@ -46,7 +46,7 @@
 #'       new_counts <- counts
 #'       new_counts[!names(new_counts) %in% input$choices] <- 0
 #'
-#'       updateCountBarLabels(
+#'       updateCountBars(
 #'         inputId = "counts",
 #'         choices = levels(choices),
 #'         countsmax = c(20, 20, 20),
@@ -56,7 +56,7 @@
 #'   }
 #' )
 #' @keywords internal
-countBarLabels <- function(inputId, choices, countsmax, countsnow = NULL) {
+countBars <- function(inputId, choices, countsmax, countsnow = NULL) {
   checkmate::assert_string(inputId)
   checkmate::assert_vector(choices)
   checkmate::assert_numeric(countsmax, len = length(choices))
@@ -73,7 +73,7 @@ countBarLabels <- function(inputId, choices, countsmax, countsnow = NULL) {
     countmax <- countsmax[i]
     countnow <- if (is.null(countsnow)) 0 else countsnow[i]
 
-    countBarLabel(
+    countBar(
       inputId = ns(i),
       label = choice,
       countmax = countmax,
@@ -96,27 +96,14 @@ countBarLabels <- function(inputId, choices, countsmax, countsnow = NULL) {
 #'  determines `<style="width: <countmax / counttotal>%""`.
 #' @return `shiny.tag` object with a progress bar and a label.
 #' @keywords internal
-countBarLabel <- function(inputId, label, countmax, countnow = NULL, counttotal = countmax) {
+countBar <- function(inputId, label, countmax, countnow = NULL, counttotal = countmax) {
   checkmate::assert_string(inputId)
   checkmate::assert_string(label)
   checkmate::assert_number(countmax)
   checkmate::assert_number(countnow, null.ok = TRUE, upper = countmax)
   checkmate::assert_number(counttotal, lower = countmax)
 
-
-  label_html <- countLabel(inputId = inputId, label = label, countmax = countmax, countnow = countnow)
-  progress_html <- countBar(inputId = inputId, countmax = countmax, countnow = countnow, counttotal = counttotal)
-  tags$div(progress_html, label_html)
-}
-
-
-#' @rdname countBarLabel
-countBar <- function(inputId, countmax, countnow = NULL, counttotal) {
-  checkmate::assert_string(inputId)
-  checkmate::assert_number(countmax)
-  checkmate::assert_number(countnow, null.ok = TRUE)
-  checkmate::assert_number(counttotal)
-
+  label <- make_count_text(label, countmax = countmax, countnow = countnow)
   ns <- NS(inputId)
   tags$div(
     class = "progress state-count-container",
@@ -125,7 +112,8 @@ countBar <- function(inputId, countmax, countnow = NULL, counttotal) {
       id = ns("count_bar_filtered"),
       class = "progress-bar state-count-bar-filtered",
       style = sprintf("width: %s%%", countnow / counttotal * 100),
-      role = "progressbar"
+      role = "progressbar",
+      label
     ),
     tags$div(
       id = ns("count_bar_unfiltered"),
@@ -136,20 +124,8 @@ countBar <- function(inputId, countmax, countnow = NULL, counttotal) {
   )
 }
 
-#' @rdname countBarLabel
-countLabel <- function(inputId, label, countmax, countnow = NULL) {
-  checkmate::assert_string(inputId)
-  checkmate::assert_string(label)
-  checkmate::assert_number(countmax)
-  checkmate::assert_number(countnow, null.ok = TRUE)
-
-  ns <- NS(inputId)
-  label <- make_count_text(label = label, countmax = countmax, countnow = countnow)
-  label_html <- tags$div(id = ns("count_text"), class = "state-count-text", label)
-}
-
-#' @rdname countBarLabels
-updateCountBarLabels <-  function(session = getDefaultReactiveDomain(), inputId, choices,
+#' @rdname countBars
+updateCountBars <-  function(session = getDefaultReactiveDomain(), inputId, choices,
                                   countsmax, countsnow = NULL) {
     checkmate::assert_string(inputId)
     checkmate::assert_vector(choices)
@@ -162,14 +138,9 @@ updateCountBarLabels <-  function(session = getDefaultReactiveDomain(), inputId,
       choice <- choices[i]
       countmax <- countsmax[i]
       countnow <- if (is.null(countsnow)) countmax else countsnow[i]
-      updateCountLabel(
-        inputId = ns(i),
-        label = choice,
-        countmax = countmax,
-        countnow = countnow
-      )
       updateCountBar(
         inputId = ns(i),
+        label = choice,
         countmax = countmax,
         countnow = countnow,
         counttotal = counttotal
@@ -178,61 +149,46 @@ updateCountBarLabels <-  function(session = getDefaultReactiveDomain(), inputId,
   invisible(NULL)
 }
 
-#' @rdname countBarLabel
-updateCountBarLabel <- function(session = getDefaultReactiveDomain(), inputId, label,
+#' @rdname countBar
+updateCountBar <- function(session = getDefaultReactiveDomain(), inputId, label,
                                 countmax, countnow = NULL, counttotal) {
   checkmate::assert_string(inputId)
   checkmate::assert_string(label)
   checkmate::assert_number(countmax)
   checkmate::assert_number(countnow, null.ok = TRUE)
   checkmate::assert_number(counttotal)
 
-  label <- make_count_label(label, countmax = countmax, countnow = countnow)
   if (is.null(countnow)) countnow <- countmax
-
-  updateCountLabel(inputId = inputId, label = label, countmax = countmax, countnow = countnow)
-  updateCountBar(inputId = inputId, countmax = countmax, countnow = countnow, counttotal = counttotal)
-
-  invisible(NULL)
-}
-
-#' @rdname countBarLabel
-updateCountLabel <- function(session = getDefaultReactiveDomain(), inputId, label, countmax, countnow) {
-  checkmate::assert_string(inputId)
-  checkmate::assert_string(label)
-  checkmate::assert_number(countmax)
-  checkmate::assert_number(countnow, null.ok = TRUE)
-
-  label <- make_count_text(label = label, countmax = countmax, countnow = countnow)
-
+  label <- make_count_text(label, countmax = countmax, countnow = countnow)
   session$sendCustomMessage(
-    type = "updateCountLabel",
+    type = "updateCountBar",
     message = list(
       id = session$ns(inputId),
-      label = label
+      label = label,
+      countmax = countmax,
+      countnow = countnow,
+      counttotal = counttotal
     )
   )
+
+  invisible(NULL)
 }
 
-#' @rdname countBarLabel
-updateCountBar <- function(session = getDefaultReactiveDomain(), inputId, countmax, countnow, counttotal) {
+updateCountText <- function(session = getDefaultReactiveDomain(), inputId, label, countmax, countnow) {
   checkmate::assert_string(inputId)
+  checkmate::assert_string(label)
   checkmate::assert_number(countmax)
   checkmate::assert_number(countnow, null.ok = TRUE)
-  checkmate::assert_number(counttotal)
-
+  label <- make_count_text(label, countmax = countmax, countnow = countnow)
   session$sendCustomMessage(
-    type = "updateCountBar",
+    type = "updateCountText",
     message = list(
       id = session$ns(inputId),
-      countmax = countmax,
-      countnow = countnow,
-      counttotal = counttotal
+      label = label
+      )
     )
-  )
 }
 
-
 #' Make a count text
 #'
 #' Returns a text describing filtered counts. Text is composed in following way:
@@ -253,4 +209,4 @@ make_count_text <- function(label, countmax, countnow = NULL) {
     if (is.null(countnow)) "" else sprintf("%s/", countnow),
     countmax
   )
-}
+}

inst/css/filter-panel.css

@@ -255,8 +255,8 @@ a.remove_all:hover {
 .state-count-container {
   height: 1.75em;
   width: 90%;
-  position: absolute;
   background-color: white;
+  margin: 0px;
 }
 
 .state-count-bar-filtered {
@@ -271,3 +271,10 @@ a.remove_all:hover {
   position: absolute;
   width: 100%;
 }
+
+.progress-bar.state-count-bar-filtered {
+  color: var(--bs-body-color, var(--dark, #333333));
+  overflow: visible;
+  text-align: left;
+  white-space: nowrap;
+}

inst/js/count-bar-labels.js

@@ -6,13 +6,13 @@ Shiny.addCustomMessageHandler("updateCountBar",
 
     bar1.style.width = message.countnow / message.counttotal * 100 + "%";
     bar2.style.width = (message.countmax - message.countnow) / message.counttotal * 100 + "%";
+    bar1.textContent = message.label;
   }
 );
 
-Shiny.addCustomMessageHandler("updateCountLabel",
+Shiny.addCustomMessageHandler("updateCountText",
   function(message) {
-    /* updates Text */
-    let e1 = document.getElementById(message.id + "-count_text");
-    e1.textContent = message.label;
+    let el = document.getElementById(message.id)
+    el.textContent = message.label
   }
 );