Let geom_text split along aes colour

mkcor · mkcor · commit 2a7e62f96cd9 · 2014-12-29T12:00:01.000-05:00
diff --git a/R/ggplotly.R b/R/ggplotly.R
@@ -53,7 +53,8 @@ markLegends <-
        polygon=c("colour", "fill", "linetype", "size", "group"),
        bar=c("colour", "fill"),
        step=c("linetype", "size", "colour"),
-       boxplot=c("x"))
+       boxplot=c("x"),
+       text=c("colour"))
 
 markUnique <- as.character(unique(unlist(markLegends)))
 
diff --git a/R/trace_generation.R b/R/trace_generation.R
@@ -428,8 +428,8 @@ geom2trace <- list(
     if (!is.null(params$size)) {
       L$textfont$size <- params$size
     }
-    if (!is.null(data$colour)) {
-      L$textfont$color <- data$colour
+    if (!is.null(params$colour)) {
+      L$textfont$color <- params$colour
     }
     L
   },

Original file line number	Diff line number	Diff line change
`@@ -428,8 +428,8 @@ geom2trace <- list(`
`428`	`428`	`if (!is.null(params$size)) {`
`429`	`429`	`L$textfont$size <- params$size`
`430`	`430`	`}`
`431`		`- if (!is.null(data$colour)) {`
`432`		`- L$textfont$color <- data$colour`
	`431`	`+ if (!is.null(params$colour)) {`
	`432`	`+ L$textfont$color <- params$colour`
`433`	`433`	`}`
`434`	`434`	`L`
`435`	`435`	`},`