Merge branch 'master' into fix-docs

Author: salim-b

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

@@ -35,7 +35,7 @@ jobs:
           - {os: ubuntu-latest,   r: 'oldrel-1'}
           - {os: ubuntu-latest,   r: 'oldrel-2'}
           - {os: ubuntu-latest,   r: 'oldrel-3'}
-          - {os: ubuntu-latest,   r: 'oldrel-4'}
+          # - {os: ubuntu-latest,   r: 'oldrel-4'} # dependency issues with oldrel-4
 
     env:
       VISUAL_TESTS: ${{ matrix.config.visual_tests }}
@@ -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
 
@@ -63,10 +63,16 @@ jobs:
           cache-version: 3
           needs: check
 
+      - name: Set up Python (for reticulate)
+        if: matrix.config.visual_tests == true
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+
       - name: Install kaleido
         if: matrix.config.visual_tests == true
         run: |
-          Rscript -e 'library(reticulate); use_python(install_python()); py_install(c("kaleido", "plotly"))'
+          Rscript -e 'library(reticulate); use_python(Sys.which("python")); py_install(c("kaleido", "plotly"))'
         
         # Run test() before R CMD check since, for some reason, rcmdcheck::rcmdcheck() skips vdiffr tests
       - name: Run Tests

CODE_OF_CONDUCT.md

@@ -0,0 +1,43 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at accounts@plot.ly. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.4, available at [http://contributor-covenant.org/version/1/4](http://contributor-covenant.org/version/1/4/), and may also be found online at <https://community.plotly.com/pub/code-of-conduct>.

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: plotly
 Title: Create Interactive Web Graphics via 'plotly.js'
-Version: 4.10.4.9000
+Version: 4.11.0
 Authors@R: c(person("Carson", "Sievert", role = c("aut", "cre"),
     email = "cpsievert1@gmail.com", comment = c(ORCID = "0000-0002-4958-2844")),
     person("Chris", "Parmer", role = "aut",
@@ -83,6 +83,7 @@ Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
 Config/Needs/check:
     tidyverse/ggplot2,
+    ggobi/GGally,
     rcmdcheck,
     devtools,
     reshape2,

LICENSE.md

@@ -1,6 +1,6 @@
-The MIT License (MIT)
+MIT License
 
-Copyright (c) 2017 Plotly Technologies Inc
+Copyright (c) 2017-2024 Plotly Technologies Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

NEWS.md

@@ -1,16 +1,18 @@
-# plotly (development version)
+# plotly 4.11.0
 
 ## New features
 
 * `ggplotly()` now supports the `{ggridges}` package. (#2314)
 
 ## 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
 
 * Closed #2337: Creating a new `event_data()` handler no longer causes a spurious reactive update of existing `event_data()`s. (#2339)
+* Closed #2376: Removes errant boxmode warning for grouped boxplot. (#2396)
+* Closed #2392: Trivial warning about RColorBrewer minimal n value is no longer thrown (#1999) 
 
 # 4.10.4
 

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
@@ -1157,8 +1162,9 @@ utils::globalVariables(c("groupDomains", "layers", "prestats_data", "scales", "s
 
 # Get the "complete" set of theme elements and their calculated values
 calculated_theme_elements <- function(plot) {
-  if (is.function(asNamespace("ggplot2")$complete_theme)) {
-    theme <- ggplot2::complete_theme(plot$theme)
+  complete_theme <- ggfun("complete_theme")
+  if (is.function(complete_theme)) {
+    theme <- complete_theme(plot$theme)
     elements <- names(theme)
   } else {
     theme <- ggfun("plot_theme")(plot)
@@ -1435,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(

R/plotly_build.R

@@ -783,7 +783,7 @@ map_color <- function(traces, stroke = FALSE, title = "", colorway, na.color = "
     isOrdered <- all(vapply(color[isDiscrete], is.ordered, logical(1)))
     lvls <- getLevels(unlist(color[isDiscrete]))
     N <- length(lvls)
-    pal <- palette %||% if (isOrdered) viridisLite::viridis(N) else RColorBrewer::brewer.pal(N, "Set2")
+    pal <- palette %||% if (isOrdered) viridisLite::viridis(N) else RColorBrewer::brewer.pal(max(N, 3L), "Set2")
     colScale <- scales::col_factor(pal, levels = names(pal) %||% lvls, na.color = na.color)
     color_codes <- Map(function(x, y) toRGB(colScale(as.character(x)), y), color[isDiscrete], alphas[isDiscrete])
     traces[isDiscrete] <- Map(mapColor, traces[isDiscrete], color_codes)

R/utils.R

@@ -449,7 +449,7 @@ verify_attr_names <- function(p) {
   # some layout attributes (e.g., [x-y]axis can have trailing numbers)
   attrs_name_check(
     sub("[0-9]+$", "", names(p$x$layout)),
-    c(names(Schema$layout$layoutAttributes), c("barmode", "bargap", "mapType")),
+    c(names(Schema$layout$layoutAttributes), c("boxmode", "barmode", "bargap", "mapType")),
     "layout"
   )
   attrs_name_check(

README.md

@@ -100,7 +100,7 @@ ggplot2 API won’t ever support (e.g., surface,
 plot_ly(z = ~volcano, type = "surface")
 ```
 
-![<https://plot.ly/~brnvg/1134>](https://plot.ly/~brnvg/1134.png)
+![<https://plotly.com/~brnvg/1134>](https://plotly.com/~brnvg/1134.png)
 
 ## Learn more