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

Author: cpsievert

R/ggplotly.R

@@ -659,7 +659,7 @@ gg2list <- function(p) {
 
   # Legend.
   layout$margin$r <- 10
-  if (exists("increase_margin_r")) {
+  if (exists("increase_margin_r", where = as.environment("package:plotly"))) {
     layout$margin$r <- 60
   }
   layout$legend <- list(bordercolor="transparent", 
@@ -700,11 +700,10 @@ gg2list <- function(p) {
         legend.title <- colnames(p$data)[i]
     }
     legend.title <- paste0("<b>", legend.title, "</b>")
-    
     # Create legend title element as an annotation
-    if (exists("annotations")) {
-      nann <- nann + 1
-    } else {
+    if (exists("annotations", where = as.environment("package:plotly"))) {
+        nann <- nann + 1
+    } else{
       annotations <- list()
       nann <- 1
     }

R/trace_generation.R

@@ -250,7 +250,7 @@ layer2traces <- function(l, d, misc) {
 
     # special handling for bars
     if (g$geom == "bar") {
-      tr$bargap <- if (exists("bargap")) bargap else "default"
+      tr$bargap <- if (exists("bargap", where = environment())) bargap else "default"
       pos <- l$position$.super$objname
       tr$barmode <-
         if (pos %in% "identity" && tr$bargap == 0) {

tests/testthat/test-ggplot-environment.R

@@ -0,0 +1,63 @@
+context("Objects and Environments")
+
+# Expect trace function
+expect_traces <- function(gg, n_traces, name) {
+  stopifnot(is.ggplot(gg))
+  stopifnot(is.numeric(n_traces))
+  save_outputs(gg, paste0("object_environments-", 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)
+}
+
+# make data
+set.seed(955)
+dat <- data.frame(cond = rep(c("A", "B"), each=10),
+                  xvar = 1:20 + rnorm(20,sd=3),
+                  yvar = 1:20 + rnorm(20,sd=3))
+
+# make ggplot
+p <- ggplot(dat, aes(x = xvar, y = yvar, color = cond)) + 
+  geom_point() + xlab("X") + ylab("Y")
+
+# Test 1: annotation
+test_that("object annotations in environment outside plotly", {
+  annotations <- "outside of the plotly environment"
+  info <- expect_traces(p, 2, "annotations")
+  tr <- info$traces[[1]]
+  la <- info$layout
+  expect_identical(tr$type, "scatter")
+  expect_identical(la$xaxis$title, "X")
+  expect_identical(la$yaxis$title, "Y")
+  expect_true(grepl("cond", la$annotations[[1]]$text))
+})
+
+# Test 2: increase_margin_r
+test_that("object increase_margin_r in environment outside plotly", {
+  increase_margin_r <- "outside of the plotly environment"
+  info <- expect_traces(p, 2, "increase_margin_r")
+  tr <- info$traces[[1]]
+  la <- info$layout
+  expect_identical(la$xaxis$title, "X")
+  expect_identical(la$yaxis$title, "Y")
+  expect_identical(tr$type, "scatter")
+  expect_true(grepl("cond", la$annotations[[1]]$text))
+})
+
+# Test 3: bargap
+test_that("object bargap in environment outside plotly", {
+  bargap <- "outside of the plotly environment"
+  info <- expect_traces(p, 2, "bargap")
+  tr <- info$traces[[1]]
+  la <- info$layout
+  expect_identical(la$xaxis$title, "X")
+  expect_identical(la$yaxis$title, "Y")
+  expect_identical(tr$type, "scatter")
+  expect_true(grepl("cond", la$annotations[[1]]$text))
+})
+