panel.margin -> panel.spacing

Author: cpsievert

R/ggplotly.R

@@ -347,11 +347,11 @@ gg2list <- function(p, width = NULL, height = NULL, tooltip = "all",
   # panel margins must be computed before panel/axis loops
   # (in order to use get_domains())
   panelMarginX <- unitConvert(
-    theme[["panel.margin.x"]] %||% theme[["panel.margin"]],
+    theme[["panel.spacing.x"]] %||% theme[["panel.spacing"]],
     "npc", "width"
   )
   panelMarginY <- unitConvert(
-    theme[["panel.margin.y"]] %||% theme[["panel.margin"]],
+    theme[["panel.spacing.y"]] %||% theme[["panel.spacing"]],
     "npc", "height"
   )
   # space for _interior_ facet strips

tests/testthat/test-ggplot-facets.R

@@ -5,7 +5,7 @@ test_that("6 facets becomes 6 panels", {
   gg <- qplot(yield, variety, data = barley, 
               color = year, facets = site ~ ., pch = I(1))+
     theme_bw() +
-    theme(panel.margin = grid::unit(0, "cm"))
+    theme(panel.spacing = grid::unit(0, "cm"))
   info <- save_outputs(gg, "barley")
   # two legend entries, but two groups
   expect_equal(sum(sapply(info$data, "[[", "showlegend")), 2)
@@ -25,7 +25,7 @@ test_that("3 facets becomes 3 panels", {
   )
   gg <- qplot(x, y, data = df, facets = z ~ ., pch = I(1)) +
     theme_bw() +
-    theme(panel.margin = grid::unit(0, "cm"))
+    theme(panel.spacing = grid::unit(0, "cm"))
   info <- save_outputs(gg, "3-panels")
   yaxes <- sapply(info$data, "[[", "yaxis")
   xaxes <- sapply(info$data, "[[", "xaxis")