Add collaborate/cloud args to config for easy adding/removing

Author: cpsievert

R/layout.R

@@ -57,38 +57,48 @@ rangeslider <- function(p, ...) {
 #' @param p a plotly object
 #' @param ... these arguments are documented at 
 #' \url{https://github.com/plotly/plotly.js/blob/master/src/plot_api/plot_config.js}
+#' @param collaborate include the collaborate mode bar button (unique to the R pkg)?
+#' @param cloud include the send data to cloud button?
 #' @author Carson Sievert
 #' @export
-#' @examples \dontrun{
-#' config(plot_ly(), displaylogo = FALSE)
-#' }
+#' @examples
+#' 
+#' config(plot_ly(), displaylogo = FALSE, collaborate = FALSE)
+#' 
 
-config <- function(p, ...) {
-  attrs <- list(...)
-  # make sure we have the right defaults
+config <- function(p, ..., collaborate = TRUE, cloud = FALSE) {
+  
+  # make sure config is a list
   p$x$config <- p$x$config %||% list()
-  p$x$config[["modeBarButtonsToRemove"]] <- 
-    p$x$config[["modeBarButtonsToRemove"]] %||% 'sendDataToCloud'
-  p$x$config[["modeBarButtonsToAdd"]] <- 
-    p$x$config[["modeBarButtonsToAdd"]] %||% list(sharingButton())
 
-  # now accumulate
-  p$x$config[["modeBarButtonsToAdd"]] <- c(
-    p$x$config[["modeBarButtonsToAdd"]], 
-    attrs[["modeBarButtonsToAdd"]]
-  )
-  p$x$config[["modeBarButtonsToRemove"]] <- c(
-    p$x$config[["modeBarButtonsToRemove"]], 
-    attrs[["modeBarButtonsToRemove"]]
-  )
+  nms <- sapply(p$x$config[["modeBarButtonsToAdd"]], "[[", "name")
+  hasCollab <- sharingButton()[["name"]] %in% nms
+  
+  if (collaborate && !hasCollab) {
+    nAdd <- length(p$x$config[["modeBarButtonsToAdd"]])
+    p$x$config[["modeBarButtonsToAdd"]][[nAdd + 1]] <- sharingButton()
+  }
+  if (!collaborate) {
+    p$x$config[["modeBarButtonsToAdd"]][nms %in% sharingButton()[["name"]]] <- NULL
+  }
+
+  hasCloud <- !'sendDataToCloud' %in% p$x$config[["modeBarButtonsToRemove"]]
+  if (!cloud) {
+    p$x$config[["modeBarButtonsToRemove"]] <- c(
+      p$x$config[["modeBarButtonsToRemove"]], 'sendDataToCloud'
+    )
+  }
+  if (cloud) {
+    b <- p$x$config[["modeBarButtonsToRemove"]]
+    p$x$config[["modeBarButtonsToRemove"]] <- b[!b %in% 'sendDataToCloud']
+  }
 
   # ensure array
   if (length(p$x$config[["modeBarButtonsToRemove"]]) == 1) {
     p$x$config[["modeBarButtonsToRemove"]] <- list(p$x$config[["modeBarButtonsToRemove"]])
   }
 
-  # overwrite the other arguments
-  attrs <- attrs[!grepl("modeBarButtonsTo", names(attrs))]
-  p$x$config <- modify_list(p$x$config, attrs)
+  
+  p$x$config <- modify_list(p$x$config, list(...))
   p
 }

R/plotly_build.R

@@ -325,8 +325,7 @@ plotly_build.plotly <- function(p) {
   p <- verify_hovermode(p)
   # try to convert to webgl if toWebGl was used
   p <- verify_webgl(p)
-  # populate R's non-default config
-  p <- config(p)
+  # make sure plots don't get sent out of the network (for enterprise)
   p$x$base_url <- get_domain()
   p
 }

inst/examples/plotlyLinkedClick/app.R

@@ -1,6 +1,3 @@
-# git checkout feature/transmit
-# R CMD install ./
-
 library(plotly)
 library(shiny)