Merge pull request #433 from ropensci/fix/facet

Fix/facet

Author: cpsievert

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: plotly
 Title: Create Interactive Web Graphics via Plotly's JavaScript Graphing Library
-Version: 2.3.2
+Version: 2.3.3
 Authors@R: c(person("Carson", "Sievert", role = c("aut", "cre"),
     email = "cpsievert1@gmail.com"),
     person("Chris", "Parmer", role = c("aut", "cph"),

NEWS

@@ -1,3 +1,7 @@
+2.3.3 -- 27 Jan 2015
+
+Bump axis number for each trace matching a panel number. fixes #318
+
 2.3.2 -- 25 Jan 2015
 
 More accurate list of data_array properties. Fixes #415

R/ggplotly.R

@@ -546,13 +546,23 @@ gg2list <- function(p) {
         if (p$facet$free$y && panel > 1) {
           # draw a y-axis on each panel
           yaxis.name <- paste0("yaxis", panel)
-          trace.list[[i]]$yaxis <- paste0("y", panel)
+          for (j in seq_along(trace.list)) {
+            tr <- trace.list[[j]]
+            if (tr$PANEL == panel) {
+              trace.list[[j]]$yaxis <- paste0("y", panel)
+            }
+          }
           yanchor <- if (p$facet$free$x) paste0("x", panel) else paste0("x",col)
         } 
         if (p$facet$free$x && panel > 1) {
           # draw an x-axis on each panel
           xaxis.name <- paste0("xaxis", panel)
-          trace.list[[i]]$xaxis <- paste0("x", panel)
+          for (j in seq_along(trace.list)) {
+            tr <- trace.list[[j]]
+            if (tr$PANEL == panel) {
+              trace.list[[j]]$xaxis <- paste0("x", panel)
+            }
+          }
           xanchor <- if (p$facet$free$y) paste0("y", panel) else paste0("y",row)
         }
       } 

R/trace_generation.R

@@ -217,10 +217,10 @@ layer2traces <- function(l, d, misc) {
         tr$name <- as.character(name.list[[1]])
     }
     dpd <- data.params$data
-    if ("PANEL" %in% names(dpd) && nrow(dpd) > 0)
-    {
+    if ("PANEL" %in% names(dpd) && nrow(dpd) > 0) {
       tr$xaxis <- paste0("x", dpd[1, "COL"])
       tr$yaxis <- paste0("y", dpd[1, "plotly.row"])
+      tr$PANEL <- dpd[1, "PANEL"]
     }
 
     if (is.null(tr$name) || tr$name %in% names.in.legend)

tests/testthat/test-ggplot-facets.R

@@ -92,3 +92,14 @@ test_that("facet_grid(..., scales = 'free') doesnt create interior scales.", {
   expect_axes(info, 2L)
   expect_axes(info, 1L, "y")
 })
+
+gg <- ggplot(mtcars, aes(mpg, wt)) + 
+  geom_point() + geom_line() + 
+  facet_wrap(~vs, scales = "free")
+
+test_that("facet_wrap(..., scales = 'free') can handle multiple traces on each panel", {
+  info <- save_outputs(gg, "facet_wrap_free_mult")
+  yaxes <- sapply(info$data, "[[", "yaxis")
+  modes <- sapply(info$data, "[[", "mode")
+  expect_true(length(unique(paste(yaxes, modes))) == 4)
+})