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

Author: cpsievert

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: plotly
 Title: Create Interactive Web Graphics via Plotly's JavaScript Graphing Library
-Version: 2.0.16
+Version: 2.0.17
 Authors@R: c(person("Carson", "Sievert", role = c("aut", "cre"),
     email = "[email protected]"),
     person("Chris", "Parmer", role = c("aut", "cph"),

NEWS

@@ -1,3 +1,7 @@
+2.0.17 -- 22 Dec 2015
+
+Fix #358
+
 2.0.16 -- 18 Dec 2015
 
 Require ggplot2 2.0.0 or higher. For details, see #269.

R/plotly.R

@@ -419,13 +419,13 @@ colorize <- function(dat, title = "") {
     }
     dat <- list(dat)
   } else { # discrete color scale
-    dat <- traceify(dat, "color")
-    lvls <- unlist(lapply(dat, function(x) unique(x[["color"]])))
+    lvls <- unique(cols)
     N <- length(lvls)
     default <- if (is.ordered(cols)) viridis::viridis(N) 
     else RColorBrewer::brewer.pal(N, "Set2")
-    colors <- dat[[1]][["colors"]] %||% default
+    colors <- dat[["colors"]] %||% default
     colz <- scales::col_factor(colors, levels = lvls, na.color = "transparent")(lvls)
+    dat <- traceify(dat, "color")
     dat <- Map(function(x, y) { x[["marker"]] <- c(x[["marker"]], list(color = y)); x }, 
                dat, colz)
   }

tests/testthat/test-plotly.R

@@ -59,6 +59,16 @@ test_that("Custom RColorBrewer pallette works for factor variable", {
   expect_identical(sort(cols[1:3]), sort(colz))
 })
 
+test_that("Passing hex codes to colors argument works", {
+  colz <- c('#FE8268', '#81E8FE', '#FED681', '#81FED6', '#FE81A9')
+  d <- data.frame(Category = LETTERS[1:5], Value = 1:5, stringsAsFactors = F)
+  p <- plot_ly(d, x = Category, y = Value, type = "bar", 
+               color = Category, colors = colz)
+  l <- expect_traces(p, 5, "bar-color-factor-custom")
+  colz2 <- sapply(l$data, function(x) x[["marker"]][["color"]])
+  expect_identical(sort(colz), sort(colz2))
+})
+
 test_that("Mapping a numeric variable to color works", {
   p <- plot_ly(data = iris, x = Sepal.Length, y = Petal.Length, 
                color = Petal.Width, mode = "markers")