Merge branch 'master' of github.com:ropensci/plotly into fix/subplot

Author: cpsievert

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: plotly
 Title: Create Interactive Web Graphics via 'plotly.js'
-Version: 3.5.1
+Version: 3.5.4
 Authors@R: c(person("Carson", "Sievert", role = c("aut", "cre"),
     email = "[email protected]"),
     person("Chris", "Parmer", role = c("aut", "cph"),

NEWS

@@ -1,8 +1,27 @@
-3.6.0 -- 26 Apr 2016
+3.5.4 -- 5 May 2016
+
+BUG FIX:
+
+gg2list() now returns an object of class "plotly_built" instead of "plotly"
+to ensure a sensible print method is invoked.
+
+3.5.3 -- 3 May 2016
+
+CHANGES:
+
+Upgrade to plotlyjs v1.10.1 -- https://github.com/plotly/plotly.js/releases/tag/v1.10.1
+
+3.5.2 -- 2 May 2016
+
+BUG FIX:
+
+Added missing key properties in ggplotly() converter so selections can be accessible via event_data().
+
+3.5.1 -- 26 Apr 2016
 
 CHANGES:
 
-Upgrade to plotlyjs v1.10.0 -- https://github.com/plotly/plotly.js/releases/tag/v1.9.0
+Upgrade to plotlyjs v1.10.0 -- https://github.com/plotly/plotly.js/releases/tag/v1.10.0
 
 Distinguish between "built" (plotly_built) and "non-built" (plotly_hash) plotly objects. See #562
 

R/ggplotly.R

@@ -664,7 +664,7 @@ gg2list <- function(p, width = NULL, height = NULL, tooltip = "all", source = "A
   l$width <- width
   l$height <- height
   l$source <- source
-  structure(l, class = "plotly")
+  structure(l, class = "plotly_built")
 }
 
 

R/layers2traces.R

@@ -376,6 +376,7 @@ geom2trace.GeomPath <- function(data, params, p) {
     x = data$x,
     y = data$y,
     text = data$hovertext,
+    key = data$key,
     type = "scatter",
     mode = "lines",
     name = if (inherits(data, "GeomSmooth")) "fitted values",
@@ -433,6 +434,7 @@ geom2trace.GeomBar <- function(data, params, p) {
     x = data$x,
     y = data$y,
     text = data$hovertext,
+    key = data$key,
     type = "bar",
     marker = list(
       autocolorscale = FALSE,
@@ -455,6 +457,7 @@ geom2trace.GeomPolygon <- function(data, params, p) {
     x = data$x,
     y = data$y,
     text = data$hovertext,
+    key = data$key,
     type = "scatter",
     mode = "lines",
     line = list(
@@ -515,6 +518,7 @@ geom2trace.GeomText <- function(data, params, p) {
     x = data$x,
     y = data$y,
     text = data$label,
+    key = data$key,
     textfont = list(
       # TODO: how to translate fontface/family?
       size = aes2plotly(data, params, "size"),

R/utils.R

@@ -73,7 +73,7 @@ last_plot <- function(data = NULL) {
   if (inherits(p, "try-error")) stop("The last plot doesn't exist")
   structure(
     p, 
-    class = unique(c("plotly", class(p)))
+    class = unique(c("plotly_hash", class(p)))
   )
 }
 

inst/htmlwidgets/lib/plotlyjs/plotly-latest.min.js

@@ -1,6 +1,6 @@
 dependencies:
   - name: plotlyjs
-    version: 1.10.0
+    version: 1.10.1
     src: "htmlwidgets/lib/plotlyjs"
     script: plotly-latest.min.js
     stylesheet: plotly-htmlwidgets.css