Implement default selections

NEWS.md

@@ -1,6 +1,6 @@
 ## crosstalk 1.1.1.9000
 
-* Add `selected` parameter for to specifying default selections in `filter_select()` and `filter_checkbox()`.
+* Add `selected` parameter for to specifying default selections in `filter_select()`, `filter_checkbox()`, and `filter_slider()`.
 
 ## crosstalk 1.1.1
 

R/controls.R

@@ -302,7 +302,7 @@ inlineCheckbox <- function(id, value, label, checked) {
 filter_slider <- function(id, label, sharedData, column, step = NULL,
   round = FALSE, ticks = TRUE, animate = FALSE, width = NULL, sep = ",",
   pre = NULL, post = NULL, timeFormat = NULL,
-  timezone = NULL, dragRange = TRUE, min = NULL, max = NULL)
+  timezone = NULL, dragRange = TRUE, min = NULL, max = NULL, selected = NULL)
 {
   # TODO: Check that this works well with factors
   # TODO: Handle empty data frame, NA/NaN/Inf/-Inf values
@@ -320,6 +320,16 @@ filter_slider <- function(id, label, sharedData, column, step = NULL,
     max <- max(values)
   value <- range(values)
 
+  if (!is.null(selected)) {
+    if (!is.numeric(selected) || length(selected) != 2) {
+      stop("selected must be a numeric vector of length 2")
+    }
+    selected <- sort(selected)
+    if (min(selected) < min || max < max(selected)) {
+      stop("selected range must be within min/max range")
+    }
+  }
+
   ord <- order(col)
   options <- list(
     values = col[ord],
@@ -403,8 +413,8 @@ filter_slider <- function(id, label, sharedData, column, step = NULL,
     `data-type` = if (length(value) > 1) "double",
     `data-min` = formatNoSci(min),
     `data-max` = formatNoSci(max),
-    `data-from` = formatNoSci(value[1]),
-    `data-to` = if (length(value) > 1) formatNoSci(value[2]),
+    `data-from` = selected[1] %||% formatNoSci(value[1]),
+    `data-to` = selected[2] %||% if (length(value) > 1) formatNoSci(value[2]),
     `data-step` = formatNoSci(step),
     `data-grid` = ticks,
     `data-grid-num` = n_ticks,

R/utils.R

@@ -0,0 +1,3 @@
+"%||%" <- function(x, y) {
+  if (is.null(x)) y else x
+}

javascript/src/input_slider.js

@@ -76,7 +76,7 @@ input.register({
 
     let lastKnownKeys = null;
 
-    $el.on("change.crosstalkSliderInput", function(event) {
+    function updateFilter() {
       if (!$el.data("updating") && !$el.data("animating")) {
         let [from, to] = getValue();
         let keys = [];
@@ -90,26 +90,22 @@ input.register({
         ctHandle.set(keys);
         lastKnownKeys = keys;
       }
-    });
-
-
-    // let $el = $(el);
-    // $el.on("change", "input[type="checkbox"]", function() {
-    //   let checked = $el.find("input[type="checkbox"]:checked");
-    //   if (checked.length === 0) {
-    //     ctHandle.clear();
-    //   } else {
-    //     let keys = {};
-    //     checked.each(function() {
-    //       data.map[this.value].forEach(function(key) {
-    //         keys[key] = true;
-    //       });
-    //     });
-    //     let keyArray = Object.keys(keys);
-    //     keyArray.sort();
-    //     ctHandle.set(keyArray);
-    //   }
-    // });
+    }
+    $el.on("change.crosstalkSliderInput", updateFilter);
+
+    updateFilter();
+
+    // Update filter now in case this code happens to execute
+    // after widget(s) are done rendering
+    updateFilter();
+
+    // Schedule another update when all widgets are done rendering
+    // This is especially relevant for `runtime: shiny` where widgets
+    // likely haven't rendered at this point and may only register
+    // FilterHandle.on("change", ...) callbacks in their renderValue
+    if (window.HTMLWidgets) {
+      window.HTMLWidgets.addPostRenderHandler(updateFilter);
+    }
 
     return {
       suspend: function() {