don't draw blank or interior facet strip in grid layout; add ... argument to ggplotly()

Author: cpsievert

R/ggplotly.R

@@ -31,13 +31,13 @@
 #' }
 #'
 ggplotly <- function(p = ggplot2::last_plot(), width = NULL, height = NULL,
-                     tooltip = "all", source = "A") {
+                     tooltip = "all", source = "A", ...) {
   UseMethod("ggplotly", p)
 }
 
 #' @export
 ggplotly.ggmatrix <- function(p = ggplot2::last_plot(), width = NULL,
-                              height = NULL, tooltip = "all", source = "A") {
+                              height = NULL, tooltip = "all", source = "A", ...) {
   plotList <- list()
   for (i in seq_len(p$nrow)) {
     for (j in seq_len(p$ncol)) {
@@ -47,14 +47,14 @@ ggplotly.ggmatrix <- function(p = ggplot2::last_plot(), width = NULL,
   # TODO: 
   # (1) how to show x/y titles? Should these be arguments in subplot?
   # (2) it only makes since to share axes on the lower diagonal
-  l <- get_plot(do.call(subplot, c(plotList, list(nrows = p$nrow))))
+  l <- get_plot(do.call(subplot, c(plotList, list(nrows = p$nrow, ...))))
   l$layout$title <- p$title
   hash_plot(p$data, l)
 }
 
 #' @export
 ggplotly.ggplot <- function(p = ggplot2::last_plot(), width = NULL, 
-                            height = NULL, tooltip = "all", source = "A") {
+                            height = NULL, tooltip = "all", source = "A", ...) {
   l <- gg2list(p, width = width, height = height, tooltip = tooltip, source = source)
   hash_plot(p$data, l)
 }
@@ -67,9 +67,10 @@ ggplotly.ggplot <- function(p = ggplot2::last_plot(), width = NULL,
 #' tooltip. The default, "all", means show all the aesthetic tooltips
 #' (including the unofficial "text" aesthetic).
 #' @param source Only relevant for \link{event_data}.
+#' @param ... currently not used
 #' @return a 'built' plotly object (list with names "data" and "layout").
 #' @export
-gg2list <- function(p, width = NULL, height = NULL, tooltip = "all", source = "A") {
+gg2list <- function(p, width = NULL, height = NULL, tooltip = "all", source = "A", ...) {
   # ------------------------------------------------------------------------
   # Our internal version of ggplot2::ggplot_build(). Modified from
   # https://github.com/hadley/ggplot2/blob/0cd0ba/R/plot-build.r#L18-L92
@@ -469,6 +470,8 @@ gg2list <- function(p, width = NULL, height = NULL, tooltip = "all", source = "A
       col_txt <- paste(
         p$facet$labeller(lay[names(p$facet[[col_vars]])]), collapse = ", "
       )
+      if (is_blank(theme[["strip.text.x"]])) col_txt <- ""
+      if (inherits(p$facet, "grid") && lay$ROW != 1) col_txt <- ""
       if (nchar(col_txt) > 0) {
         col_lab <- make_label(
           col_txt, x = mean(xdom), y = max(ydom),
@@ -482,6 +485,8 @@ gg2list <- function(p, width = NULL, height = NULL, tooltip = "all", source = "A
       row_txt <- paste(
         p$facet$labeller(lay[names(p$facet$rows)]), collapse = ", "
       )
+      if (is_blank(theme[["strip.text.y"]])) row_txt <- ""
+      if (inherits(p$facet, "grid") && lay$COL != nCols) row_txt <- ""
       if (nchar(row_txt) > 0) {
         row_lab <- make_label(
           row_txt, x = max(xdom), y = mean(ydom),