Updates in support of ggplot2 v4.0.0

.github/workflows/R-CMD-check.yaml

@@ -46,7 +46,7 @@ jobs:
       plotly_api_key: ${{ secrets.PLOTLY_API_KEY }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
 

DESCRIPTION

@@ -82,6 +82,7 @@ RoxygenNote: 7.3.2
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
 Config/Needs/check:
+    tidyverse/ggplot2,
     rcmdcheck,
     devtools,
     reshape2,

NEWS.md

@@ -6,7 +6,7 @@
 
 ## Improvements
 
-* `ggplotly()` now works better with the development version of ggplot2 (> v3.4.4). (#2315, #2368)
+* Various updates to `ggplotly()` to better support recent versions of ggplot2. (#2315, #2368, #2442, thanks @teunbrand).
 
 ## Bug fixes
 

R/ggplotly.R

@@ -668,7 +668,9 @@ gg2list <- function(p, width = NULL, height = NULL,
           "\\*\\s+degree[ ]?[\\*]?", "&#176;", 
           gsub("\"", "", tickData[["degree_label"]])
         )
-        rng[[paste0(xy, ".major")]] <- tickData[[paste0(xy, "_start")]]
+        # Downstream logic expects these 'break positions' to be on 0-1 scale
+        # (which is then rescaled back to the data scale)
+        rng[[paste0(xy, ".major")]] <- scales::rescale(tickData[[paste0(xy, "_start")]])
 
         # If it doesn't already exist (for this panel), 
         # generate graticule (as done in, CoordSf$render_bg)
@@ -742,8 +744,8 @@ gg2list <- function(p, width = NULL, height = NULL,
 
       # https://github.com/tidyverse/ggplot2/pull/3566#issuecomment-565085809
       hasTickText <- !(is.na(ticktext) | is.na(tickvals))
-      ticktext <- ticktext[hasTickText]
-      tickvals <- tickvals[hasTickText]
+      ticktext <- as.character(unlist(ticktext[hasTickText]))
+      tickvals <- as.numeric(unlist(tickvals[hasTickText]))
 
       axisObj <- list(
         # TODO: log type?
@@ -783,8 +785,11 @@ gg2list <- function(p, width = NULL, height = NULL,
       # set scaleanchor/scaleratio if these are fixed coordinates
       # the logic here is similar to what p$coordinates$aspect() does,
       # but the ratio is scaled to the data range by plotly.js 
-      fixed_coords <- c("CoordSf", "CoordFixed", "CoordMap", "CoordQuickmap")
-      if (inherits(p$coordinates, fixed_coords)) {
+      is_fixed <- inherits(
+        p$coordinates,
+        c("CoordSf", "CoordFixed", "CoordMap", "CoordQuickmap")
+      )
+      if (is_fixed || isFALSE(p$coordinates$is_free())) {
         axisObj$scaleanchor <- anchor
         ratio <- p$coordinates$ratio %||% 1
         axisObj$scaleratio <- if (xy == "y") ratio else 1 / ratio
@@ -1436,7 +1441,9 @@ gdef2trace <- function(gdef, theme, gglayout) {
     }
 
     vals <- lapply(gglayout[c("xaxis", "yaxis")], function(ax) {
-      if (identical(ax$tickmode, "auto")) ax$ticktext else ax$tickvals
+      res <- if (identical(ax$tickmode, "auto")) ax$ticktext else ax$tickvals
+      # if zero-length, return NULL to avoid subscript oob errors
+      res %||% NULL
     })
 
     list(

R/layers2traces.R

@@ -197,6 +197,7 @@ to_basic.GeomCol <- function(data, prestats_data, layout, params, p, ...) {
 #' @export
 to_basic.GeomViolin <- function(data, prestats_data, layout, params, p, ...) {
   n <- nrow(data)
+  data <- data[order(data[["y"]], decreasing = FALSE), ]
   revData <- data[order(data[["y"]], decreasing = TRUE), ]
   idx <- !names(data) %in% c("x", "xmin", "xmax")
   data <- rbind(

tests/testthat/test-ggplot-labels.R

@@ -51,6 +51,6 @@ test_that("empty labels work", {
   p <- ggplot(palmerpenguins::penguins, 
               aes(bill_length_mm, bill_depth_mm, color = species)) + 
     geom_point() + 
-    labs(x = element_blank(), y = element_blank())
+    labs(x = NULL, y = NULL)
   b <- expect_doppelganger_built(p, "labs-element-blank")
 })

tests/testthat/test-ggplot-ticks.R

@@ -171,7 +171,7 @@ test_that("Set the X tick mark locations", {
 test_that("The breaks can be spaced unevenly", {
   boxes.uneven <- boxes +
     scale_y_continuous(breaks = c(4, 4.25, 4.5, 5, 6, 8))
-  info <- expect_traces(no.breaks, 1, "uneven")
+  info <- expect_traces(boxes.uneven, 1, "uneven")
 })
 
 test_that("R line breaks are translated to HTML line breaks", {