Merge branch 'baobao-legend_hide' of https://github.com/ropensci/plotly into baobao-legend_hide

Author: cpsievert

R/ggplotly.R

@@ -105,7 +105,8 @@ markLegends <-
        ## group, even when they have the exact same visual
        ## characteristics and could be drawn using just 1 trace!
        polygon=c("colour", "fill", "linetype", "size"),
-       bar=c("colour", "fill"),
+       bar = c("colour", "fill"),
+       density = c("colour", "fill", "linetype"),
        errorbar=c("colour", "linetype"),
        errorbarh=c("colour", "linetype"),
        area=c("colour", "fill"),
@@ -305,6 +306,9 @@ gg2list <- function(p) {
     traces <- layer2traces(L, df, misc)
 
     possible.legends <- markLegends[[L$geom$objname]]
+    if (L$geom$objname == "boxplot"){
+      possible.legends <- markSplit[[L$geom$objname]]
+    }
     actual.legends <- possible.legends[possible.legends %in% names(L$mapping)]
     layer.legends[[paste(i)]] <- actual.legends
 

tests/testthat/test-ggplot-boxplot.R

@@ -1,5 +1,19 @@
 context("Boxplot")
 
+expect_traces <- function(gg, n.traces, name) {
+  stopifnot(is.ggplot(gg))
+  stopifnot(is.numeric(n.traces))
+  save_outputs(gg, paste0("boxplot-", name))
+  L <- gg2list(gg)
+  all.traces <- L$data
+  no.data <- sapply(all.traces, function(tr) {
+    is.null(tr[["x"]]) && is.null(tr[["y"]])
+  })
+  has.data <- all.traces[!no.data]
+  expect_equal(length(has.data), n.traces)
+  list(traces=has.data, layout=L$layout)
+}
+
 test_that("geom_boxplot gives a boxplot", {
   gg <- ggplot(mtcars, aes(factor(cyl), mpg)) + geom_boxplot()
 
@@ -42,3 +56,33 @@ test_that("you can make a boxplot for a distribution of datetimes", {
   expect_identical(L$data[[1]]$type, "box")
   expect_identical(L$data[[1]]$y, as.character(df$y))
 })
+
+# check legend shows up when each box-and-whiskers has a fill
+# make ggplot2
+m <- ggplot(mtcars, aes(factor(cyl), mpg))
+p <- m + geom_boxplot(aes(fill = factor(cyl)))
+# tests
+test_that("legends for boxplot", {
+  info <- expect_traces(p, 3, "legends_for_fill")
+  tr <- info$traces
+  la <- info$layout
+  expect_identical(tr[[1]]$type, "box")
+  # check legend exists
+  expect_identical(la$showlegend, TRUE)
+  # check legend for each fill exists
+  for (i in 1:3) {
+    expect_identical(tr[[i]]$showlegend, TRUE)
+  }
+  # check the fill colors are correct
+  g <- ggplot_build(p)
+  fill.colors <- unique(g$data[[1]]["fill"])[,1]
+  for (i in 1:3) {
+    plotly.color <- as.integer(strsplit(gsub("[\\(\\)]|rgb", "", 
+                tr[[i]]$fillcolor), split = ",")[[1]])
+    names(plotly.color) <- c("red", "green", "blue")
+    expect_equal(plotly.color, col2rgb(fill.colors[i])[,1], 
+                 tolerance = 1)
+  }
+})
+
+

tests/testthat/test-ggplot-density.R

@@ -28,10 +28,28 @@ test_that("geom_density() respects fill aesthetic", {
   gg <- base + geom_density(aes(fill=factor(vs)), alpha = 0.3)
   info <- expect_traces(gg, 2, "fill")
   trs <- info$traces
+  la <- info$layout
   type <- unique(sapply(trs, "[[", "type"))
   fill <- unique(sapply(trs, "[[", "fill"))
   expect_identical(type, "scatter")
   expect_identical(fill, "tozeroy")
+  # check legend exists
+  expect_identical(la$showlegend, TRUE)
+  # check legend for each fill exists
+  for (i in 1:2) {
+    expect_identical(trs[[i]]$showlegend, TRUE)
+  }
+  # check the fill colors are correct
+  g <- ggplot_build(gg)
+  fill.colors <- unique(g$data[[1]]["fill"])[,1]
+  for (i in 1:2) {
+    plotly.color <- as.integer(
+      strsplit(gsub("[\\(\\)]|rgba", "", 
+                    trs[[i]]$fillcolor), split = ",")[[1]])[1:3]
+    names(plotly.color) <- c("red", "green", "blue")
+    expect_equal(plotly.color, col2rgb(fill.colors[i])[,1], 
+                 tolerance = 1)
+  }
 })
 
 test_that("geom_density() respects colour aesthetic", {