Merge branch 'master' into input-events

cpsievert · cpsievert · commit 1437d645321c · 2018-12-17T09:20:21.000-06:00
diff --git a/NEWS.md b/NEWS.md
@@ -11,6 +11,7 @@
 * The `orca()` function now supports conversion of much larger figures (#1322) and works without a mapbox api token (#1314).
 * The `style()` function now supports "partial updates" (i.e. modification of a particular property of an object, rather than the entire object). For example, notice how the first plot retains the original marker shape (a square): `p <- plot_ly(x = 1:10, y = 1:10, symbol = I(15)); subplot(style(p, marker.color = "red"), style(p, marker = list(color = "red")))` (#1342).
 * **plotly** objects can now be serialized and unserialized in different environments (i.e., you can now use `saveRDS()` to save an object as an rds file and restore it on another machine with `readRDS()`). Note this object is *dynamically* linked to JavaScript libraries, so one should take care to use consistent versions of **plotly** when serializing and unserializing (#1376).
+* The `plotly_example()` will now attempt to open the source file(s) used to run the example. Set `edit = FALSE` to prevent the source file(s) from opening.
 
 ## BUG FIXES
 
@@ -24,6 +25,7 @@
 * Fixed issue where **dplyr** groups caused a problem in the ordering of data arrays passed to `marker` objects (#1351).
 * In some cases, a `ggplotly()` colorbar would cause issues with hover behavior, which is now fixed (#1381).
 * An articial marker no longer appears when clearing a crosstalk selection of a plot with a colorbar (#1406).
+* Clearing a highlight event via crosstalk no longer deletes all the traces added since initial draw (#1436).
 * Recursive attribute validation is now only performed on recursive objects (#1315).
 
 # 4.8.0
diff --git a/R/orca.R b/R/orca.R
@@ -204,9 +204,14 @@ orca_serve <- function(port = 5151, mathjax = FALSE, safe = FALSE, request_limit
   )
 }
 
+correct_orca <- function() {
+  orca_help <- processx::run("orca", "-h")
+  grepl("plotly", orca_help[["stdout"]], ignore.case = TRUE)
+}
+
 
 orca_available <- function() {
-  if (Sys.which("orca") == "") {
+  if (Sys.which("orca") == "" || !correct_orca()) {
     stop(
       "The orca command-line utility is required for this functionality.\n\n",
       "Please follow the installation instructions here -- https://github.com/plotly/orca#installation",
diff --git a/R/plotly_example.R b/R/plotly_example.R
@@ -5,20 +5,21 @@
 #' 
 #' @param type the type of example
 #' @param name the name of the example (valid names depend on `type`).
+#' @param edit whether to open the relevant source files using [file.edit]. Only relevant if `type` is `"shiny"` or `"rmd"`.
 #' @param ... arguments passed onto the suitable method.
 #' @export
 #' @author Carson Sievert
 
-plotly_example <- function(type = c("demo", "shiny", "rmd"), name, ...) {
+plotly_example <- function(type = c("demo", "shiny", "rmd"), name, edit = TRUE, ...) {
   
   type <- match.arg(type)
   
   # demos don't necessarily need a name
   if (type == "demo") {
     if (missing(name)) {
-      return(utils::demo(package = "plotly")) 
+      return(utils::demo(package = "plotly", ...)) 
     } else  {
-      return(utils::demo(topic = name, package = "plotly"))
+      return(utils::demo(topic = name, package = "plotly", ...))
     }
   }
   
@@ -36,6 +37,11 @@ plotly_example <- function(type = c("demo", "shiny", "rmd"), name, ...) {
   }
   
   finalDir <- system.file("examples", type, name, package = "plotly")
+  if (edit) {
+    files <- list.files(finalDir, full.names = TRUE)
+    scripts <- files[tools::file_ext(files) %in% c("R", "Rmd")]
+    file.edit(scripts)
+  }
   
   if (type == "shiny") {
     try_library("shiny", "plotly_example")
diff --git a/inst/htmlwidgets/plotly.js b/inst/htmlwidgets/plotly.js
@@ -639,8 +639,8 @@ TraceManager.prototype.updateSelection = function(group, keys) {
   var nNewTraces = this.gd.data.length - this.origData.length;
   if (keys === null || !this.highlight.persistent && nNewTraces > 0) {
     var tracesToRemove = [];
-    for (var i = this.origData.length; i < this.gd.data.length; i++) {
-      tracesToRemove.push(i);
+    for (var i = 0; i < this.gd.data.length; i++) {
+      if (this.gd.data[i]._isCrosstalkTrace) tracesToRemove.push(i);
     }
     Plotly.deleteTraces(this.gd, tracesToRemove);
     this.groupSelections[group] = keys;
@@ -722,6 +722,7 @@ TraceManager.prototype.updateSelection = function(group, keys) {
         // (necessary for updating frames to reflect the selection traces)
         trace._originalIndex = i;
         trace._newIndex = this.gd._fullData.length + traces.length;
+        trace._isCrosstalkTrace = true;
         traces.push(trace);
       }
     }
diff --git a/man/plotly_example.Rd b/man/plotly_example.Rd

Original file line number	Diff line number	Diff line change
`@@ -204,9 +204,14 @@ orca_serve <- function(port = 5151, mathjax = FALSE, safe = FALSE, request_limit`
`204`	`204`	`)`
`205`	`205`	`}`
`206`	`206`
	`207`	`+correct_orca <- function() {`
	`208`	`+ orca_help <- processx::run("orca", "-h")`
	`209`	`+ grepl("plotly", orca_help[["stdout"]], ignore.case = TRUE)`
	`210`	`+}`
	`211`	`+`
`207`	`212`
`208`	`213`	`orca_available <- function() {`
`209`		`- if (Sys.which("orca") == "") {`
	`214`	`+ if (Sys.which("orca") == "" \|\| !correct_orca()) {`
`210`	`215`	`stop(`
`211`	`216`	`"The orca command-line utility is required for this functionality.\n\n",`
`212`	`217`	`"Please follow the installation instructions here -- https://github.com/plotly/orca#installation",`
Original file line number	Diff line number	Diff line change
`@@ -639,8 +639,8 @@ TraceManager.prototype.updateSelection = function(group, keys) {`
`639`	`639`	`var nNewTraces = this.gd.data.length - this.origData.length;`
`640`	`640`	`if (keys === null \|\| !this.highlight.persistent && nNewTraces > 0) {`
`641`	`641`	`var tracesToRemove = [];`
`642`		`- for (var i = this.origData.length; i < this.gd.data.length; i++) {`
`643`		`- tracesToRemove.push(i);`
	`642`	`+ for (var i = 0; i < this.gd.data.length; i++) {`
	`643`	`+ if (this.gd.data[i]._isCrosstalkTrace) tracesToRemove.push(i);`
`644`	`644`	`}`
`645`	`645`	`Plotly.deleteTraces(this.gd, tracesToRemove);`
`646`	`646`	`this.groupSelections[group] = keys;`
`@@ -722,6 +722,7 @@ TraceManager.prototype.updateSelection = function(group, keys) {`
`722`	`722`	`// (necessary for updating frames to reflect the selection traces)`
`723`	`723`	`trace._originalIndex = i;`
`724`	`724`	`trace._newIndex = this.gd._fullData.length + traces.length;`
	`725`	`+ trace._isCrosstalkTrace = true;`
`725`	`726`	`traces.push(trace);`
`726`	`727`	`}`
`727`	`728`	`}`