support ggplot2 2.2.0

Author: daattali

R/ggMarginal.R

@@ -188,7 +188,7 @@ ggMarginal <- function(p, data, x, y, type = c("density", "histogram", "boxplot"
     # Add the longest y axis label to the top plot and ensure it's at a y value
     # that is on the plot (this is why I build the top plot, to know the y values)
     pbTop <- ggplot2::ggplot_build(top)
-    ylabels <- pb$panel$ranges[[1]]$y.labels
+    ylabels <- pb$layout$panel_ranges[[1]]$y.labels
     ylabel <- ylabels[which.max(nchar(ylabels))]      
     if (type == "boxplot") {
       top <-

R/ggMarginalHelpers.R

@@ -35,16 +35,16 @@ marginPlot <- function(margin, type, xvar, yvar, xparams, yparams, pb, data,
     extraParams <- append(xparams, extraParams)
     extraParams <- extraParams[!duplicated(names(extraParams))]
     if (type == "histogram") {
-      if (!is.null(pb$panel$x_scales[[1]]$get_limits)) {
-        extraParams[[originParamName]] <- pb$panel$x_scales[[1]]$get_limits()[1]
+      if (!is.null(pb$layout$panel_scales$x[[1]]$get_limits)) {
+        extraParams[[originParamName]] <- pb$layout$panel_scales$x[[1]]$get_limits()[1]
       }
     }
   } else if (margin == "y") {
     extraParams <- append(yparams, extraParams)
     extraParams <- extraParams[!duplicated(names(extraParams))]
     if (type == "histogram") {
-      if (!is.null(pb$panel$y_scales[[1]]$get_limits)) {
-        extraParams[[originParamName]] <- pb$panel$y_scales[[1]]$get_limits()[1]
+      if (!is.null(pb$layout$panel_scales$y[[1]]$get_limits)) {
+        extraParams[[originParamName]] <- pb$layout$panel_scales$y[[1]]$get_limits()[1]
       }
     }      
   }
@@ -172,18 +172,18 @@ addMainTheme <- function(marginal, margin, p) {
 getScale <- function(margin, type, pb) {
   if (margin == "x") {
     if (type == "boxplot") {
-      scale <- pb$panel$x_scales[[1]]
+      scale <- pb$layout$panel_scales$x[[1]]
       scale$aesthetics <- gsub("^x", "y", scale$aesthetics)
-      scale$limits <- pb$panel$x_scales[[1]]$get_limits()
+      scale$limits <- pb$layout$panel_scales$x[[1]]$get_limits()
     } else {
-      scale <- pb$panel$x_scales[[1]]
+      scale <- pb$layout$panel_scales$x[[1]]
     }
   } else if (margin == "y") { 
     if (type == "boxplot") {
-      scale <- pb$panel$y_scales[[1]]
-      scale$limits <- pb$panel$y_scales[[1]]$get_limits()
+      scale <- pb$layout$panel_scales$y[[1]]
+      scale$limits <- pb$layout$panel_scales$y[[1]]$get_limits()
     } else {
-      scale <- pb$panel$y_scales[[1]]
+      scale <- pb$layout$panel_scales$y[[1]]
       scale$aesthetics <- gsub("^y", "x", scale$aesthetics)
     }
   }
@@ -195,9 +195,9 @@ getScale <- function(margin, type, pb) {
 # marginal plots will use the same range
 getLimits <- function(pb, margin) {
   if (margin == "x") {
-    scales <- pb$panel$x_scales[[1]]
+    scales <- pb$layout$panel_scales$x[[1]]
   } else if (margin == "y") {
-    scales <- pb$panel$y_scales[[1]]
+    scales <- pb$layout$panel_scales$y[[1]]
   } else {
     stop("Invalid `margin` parameter (only x and y are supported)", call. = FALSE)
   }