Work around scale_y_continuous() behavior in {ggplot2@3.5} (#488)

ggobi · Feb 12, 2024 · b062ddf · b062ddf
1 parent b889015
commit b062ddf
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -77,4 +77,4 @@ Encoding: UTF-8
 Language: en-US
 RdMacros: lifecycle
 Remotes:
-    tidyverse/ggplot2
+    tidyverse/ggplot2@rc/3.5.0
diff --git a/R/ggnet.R b/R/ggnet.R
@@ -386,7 +386,7 @@ ggnet <- function(
 
       y = ifelse(is_dir == "digraph", "directed", "undirected")
       z = c("indegree" = "in", "outdegree" = "out", "degree" = "all", "freeman" = "all")[x]
-      data$weight = igraph::degree(igraph::graph.adjacency(as.matrix(net), mode = y), mode = z)
+      data$weight = igraph::degree(igraph_graph_adjacency_matrix(as.matrix(net), mode = y), mode = z)
 
     } else {
       data$weight = sna::degree(net, gmode = is_dir, cmode = ifelse(x == "degree", "freeman", x))
@@ -736,3 +736,12 @@ ggnet <- function(
   return(p)
 
 }
+
+
+igraph_graph_adjacency_matrix <- function(...) {
+  if (packageVersion("igraph") >= "2.0.0") {
+    igraph::graph_from_adjacency_matrix(...)
+  } else {
+    igraph::graph.adjacency(...)
+  }
+}
diff --git a/R/ggnet2.R b/R/ggnet2.R
@@ -505,7 +505,7 @@ ggnet2 <- function(
 
       y = ifelse(is_dir == "digraph", "directed", "undirected")
       z = c("indegree" = "in", "outdegree" = "out", "degree" = "all", "freeman" = "all")[x]
-      data$size = igraph::degree(igraph::graph.adjacency(as.matrix(net), mode = y), mode = z)
+      data$size = igraph::degree(igraph_graph_adjacency_matrix(as.matrix(net), mode = y), mode = z)
 
     } else {
       data$size = sna::degree(net, gmode = is_dir, cmode = ifelse(x == "degree", "freeman", x))

diff --git a/R/ggpairs_internal_plots.R b/R/ggpairs_internal_plots.R
@@ -124,7 +124,7 @@ wrap_fn_with_param_arg <- function(
     allParams$mapping <- mapping
     argsList <- list(...)
     allParams[names(argsList)] <- argsList
-    do.call(original_fn, allParams)
+    rlang::inject(original_fn(!!!allParams))
   }
 
   class(ret_fn) <- "ggmatrix_fn_with_params"