Merge branch 'master' of https://github.com/plotly/plotly.R

Author: fproske

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

@@ -28,7 +28,7 @@ jobs:
         config:
           - {os: macOS-latest,   r: 'release', visual_tests: true, node: "14.x", shinytest: true}
           - {os: windows-latest, r: 'release'}
-          - {os: windows-latest, r: '3.6', rspm: "https://packagemanager.rstudio.com/cran/latest"}
+          #- {os: windows-latest, r: '3.6', rspm: "https://packagemanager.rstudio.com/cran/latest"}
           - {os: ubuntu-18.04,   r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest", http-user-agent: "R/4.1.0 (ubuntu-18.04) R (4.1.0 x86_64-pc-linux-gnu x86_64 linux-gnu) on GitHub Actions" }
           # vdiffr & shinytest only runs on linux r-release since the results aren't cross-platform
           - {os: ubuntu-18.04,   r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: plotly
 Title: Create Interactive Web Graphics via 'plotly.js' (modified for use in MIRO)
-Version: 4.10.0.9999
+Version: 4.10.1.9999
 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",
@@ -77,8 +77,9 @@ Suggests:
     forcats,
     palmerpenguins,
     rversions,
-    reticulate
+    reticulate,
+    rsvg
 LazyData: true
-RoxygenNote: 7.1.2
+RoxygenNote: 7.2.3
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)

NAMESPACE

@@ -4,7 +4,6 @@ S3method(api_create,data.frame)
 S3method(api_create,ggplot)
 S3method(api_create,plotly)
 S3method(embed_notebook,plotly)
-S3method(fortify,SharedData)
 S3method(geom2trace,GeomBar)
 S3method(geom2trace,GeomBlank)
 S3method(geom2trace,GeomBoxplot)
@@ -25,6 +24,9 @@ S3method(highlight_key,plotly)
 S3method(layout,matrix)
 S3method(layout,plotly)
 S3method(layout,shiny.tag.list)
+S3method(linewidth_or_size,Geom)
+S3method(linewidth_or_size,default)
+S3method(linewidth_or_size,element)
 S3method(plotly_build,"NULL")
 S3method(plotly_build,gg)
 S3method(plotly_build,list)
@@ -36,6 +38,7 @@ S3method(print,api_plot)
 S3method(print,kaleidoScope)
 S3method(print,plotly_data)
 S3method(to_basic,GeomAbline)
+S3method(to_basic,GeomAlluvium)
 S3method(to_basic,GeomAnnotationMap)
 S3method(to_basic,GeomArea)
 S3method(to_basic,GeomBoxplot)
@@ -47,6 +50,8 @@ S3method(to_basic,GeomDensity2d)
 S3method(to_basic,GeomDotplot)
 S3method(to_basic,GeomErrorbar)
 S3method(to_basic,GeomErrorbarh)
+S3method(to_basic,GeomFunction)
+S3method(to_basic,GeomHex)
 S3method(to_basic,GeomHline)
 S3method(to_basic,GeomJitter)
 S3method(to_basic,GeomLine)
@@ -64,6 +69,7 @@ S3method(to_basic,GeomSf)
 S3method(to_basic,GeomSmooth)
 S3method(to_basic,GeomSpoke)
 S3method(to_basic,GeomStep)
+S3method(to_basic,GeomStratum)
 S3method(to_basic,GeomTile)
 S3method(to_basic,GeomViolin)
 S3method(to_basic,GeomVline)
@@ -251,6 +257,7 @@ importFrom(purrr,transpose)
 importFrom(rlang,"!!!")
 importFrom(rlang,"!!")
 importFrom(rlang,eval_tidy)
+importFrom(rlang,is_na)
 importFrom(stats,complete.cases)
 importFrom(stats,is.leaf)
 importFrom(stats,quantile)

NEWS.md

@@ -1,20 +1,38 @@
-# 4.10.0.9000
+# 4.10.1.9000
+
+## Bug fixes
+
+* `ggplotly()` no longer errors given a `geom_area()` with 1 or less data points (error introduced by new behavior in ggplot2 v3.4.0). (#2209)
+
+
+# 4.10.1
+
+## Changes to plotly.js
+
+* This version of the R package upgrades the version of the underlying plotly.js library from v2.5.1 to v2.11.1. This includes many bug fixes and improvements. The [plotly.js release page](https://github.com/plotly/plotly.js/releases) has the full list of changes.
 
 ## New features
 
+* `plotlyOutput()` gains a new `fill` parameter. When `TRUE` (the default), the widget's container element is allowed to grow/shrink to fit it's parent container so long as that parent is opinionated about its height and has been marked with `htmltools::bindFillRole(x, container = TRUE)`. (#2198)
+  * The primary motivation for this is to allow plots to grow/shrink by default [inside `bslib::card_body_fill()`](https://rstudio.github.io/bslib/articles/cards.html#responsive-sizing)
 * `ggplotly()` now supports the `{ggalluvial}` package. (#2061, thanks @moutikabdessabour)
 * `highlight()` now supports `on="plotly_selecting"`, enabling client-side linked brushing via mouse click+drag (no mouse-up event required, as with `on="plotly_selected"`). (#1280)
+* `raster2uri()` supports nativeRaster objects. This enables nativeRaster support for
+  the `annotation_raster()` geom (#2174, @zeehio).
 
 ## Bug fixes
 
 * `ggplotly()` now converts `stat_ecdf()` properly. (#2065)
 * `ggplotly()` now correctly handles `geom_tile()` with no `fill` aesthetic. (#2063)
 * `ggplotly()` now respects `guide(aes = "none")` (e.g., `guide(fill = "none")`) when constructing legend entries. (#2067)
 * Fixed an issue with translating `GGally::ggcorr()` via `ggplotly()`. (#2012)
+* Fixed an issue where clearing a crosstalk filter would raise an error in the JS console (#2087)
+* Fixed an issue where `map_color()` would throw an error on R 4.2 (#2131)
 
 ## Improvements
 
 * `ggplotly()` does not issue warnings with `options(warnPartialMatchArgs = TRUE)` any longer. (#2046, thanks @bersbersbers)
+* `ggplotly()` does not issue warnings related to use of deprecated `tidyr::gather_()` in internals. (#2125, thanks @simonpcouch)
 
 # 4.10.0
 

R/add.R

@@ -3,7 +3,7 @@
 #' @param p a plotly visualization
 #' @param data a data frame.
 #' @export
-#' @examples 
+#' @examplesIf interactive() || !identical(.Platform$OS.type, "windows")
 #' 
 #' plot_ly() %>% add_data(economics) %>% add_trace(x = ~date, y = ~pce)
 add_data <- function(p, data = NULL) {
@@ -41,7 +41,7 @@ add_data <- function(p, data = NULL) {
 #' @author Carson Sievert
 #' @export
 #' @rdname add_trace
-#' @examples 
+#' @examplesIf interactive() || !identical(.Platform$OS.type, "windows")
 #' 
 #' # the `plot_ly()` function initiates an object, and if no trace type
 #' # is specified, it sets a sensible default
@@ -704,7 +704,7 @@ special_attrs <- function(trace) {
 # #' 
 # #' 
 # #' @export
-# #' @examples
+# #' @examplesIf interactive() || !identical(.Platform$OS.type, "windows")
 # #' 
 # #' x <- rnorm(10)
 # #' plot_ly(x = ~x) %>%

R/animate.R

@@ -28,7 +28,7 @@
 #' @rdname animation
 #' @aliases animation
 #' @author Carson Sievert
-#' @examples
+#' @examplesIf interactive() || !identical(.Platform$OS.type, "windows")
 #' 
 #' df <- data.frame(
 #'   x = c(1, 2, 2, 1, 1, 2),

R/api_exports.R

@@ -46,7 +46,7 @@
 #' @author Carson Sievert
 #' @references \url{https://api.plot.ly/v2}
 #' @seealso [signup()]
-#' @examples 
+#' @examplesIf interactive() || !identical(.Platform$OS.type, "windows")
 #' 
 #' \dontrun{
 #' 

R/dev.R

@@ -9,7 +9,7 @@
 #' or a number specifying the number of spaces to indent. See [jsonlite::prettify].
 #' @param ... other options passed onto [listviewer::jsonedit]
 #' @export
-#' @examples 
+#' @examplesIf interactive() || !identical(.Platform$OS.type, "windows")
 #'   
 #' plotly_json(plot_ly())
 #' plotly_json(plot_ly(), FALSE)
@@ -32,7 +32,7 @@ plotly_json <- function(p = last_plot(), jsonedit = interactive(), pretty = TRUE
 #' @param jsonedit use `listviewer::jsonedit` to view the JSON?
 #' @param ... other options passed onto `listviewer::jsonedit`
 #' @export
-#' @examples 
+#' @examplesIf interactive() || !identical(.Platform$OS.type, "windows")
 #' s <- schema()
 #' 
 #' # retrieve acceptable `layout.mapbox.style` values

R/ggplotly.R

@@ -304,6 +304,14 @@ gg2list <- function(p, width = NULL, height = NULL,
       d[["y_plotlyDomain"]] <- d[["y"]]
       d
     })
+    # And since we're essentially adding an "unknown" (to ggplot2) 
+    # aesthetic, add it to the dropped_aes field to avoid fals positive
+    # warnings (https://github.com/tidyverse/ggplot2/pull/4866)
+    layers <- lapply(layers, function(l) {
+      l$stat$dropped_aes <- c(l$stat$dropped_aes, "x_plotlyDomain")
+      l$stat$dropped_aes <- c(l$stat$dropped_aes, "y_plotlyDomain")
+      l
+    })
 
     # Transform all scales
     data <- lapply(data, ggfun("scales_transform_df"), scales = scales)
@@ -676,9 +684,10 @@ gg2list <- function(p, width = NULL, height = NULL,
           d$y <- scales::rescale(d$y, rng$y_range, from = c(0, 1))
           params <- list(
             colour = panelGrid$colour, 
-            size = panelGrid$size, 
             linetype = panelGrid$linetype
           )
+          nm <- linewidth_or_size(panelGrid)
+          params[[nm]] <- panelGrid[[nm]]
           grill <- geom2trace.GeomPath(d, params)
           grill$hoverinfo <- "none"
           grill$showlegend <- FALSE
@@ -723,8 +732,12 @@ gg2list <- function(p, width = NULL, height = NULL,
       isDiscrete <- identical(sc$scale_name, "position_d")
       isDiscreteType <- isDynamic && isDiscrete
 
-      ticktext <- rng[[xy]]$get_labels %()% rng[[paste0(xy, ".labels")]]
-      tickvals <- rng[[xy]]$break_positions %()% rng[[paste0(xy, ".major")]]
+      # In 3.2.x .major disappeared in favor of break_positions()
+      # (tidyverse/ggplot2#3436), but with 3.4.x break_positions() no longer
+      # yields the actual final positions on a 0-1 scale, but .major does
+      # (tidyverse/ggplot2#5029)
+      ticktext <- rng[[paste0(xy, ".labels")]] %||% rng[[xy]]$get_labels()
+      tickvals <- rng[[paste0(xy, ".major")]] %||% rng[[xy]]$break_positions()
 
       # https://github.com/tidyverse/ggplot2/pull/3566#issuecomment-565085809
       hasTickText <- !(is.na(ticktext) | is.na(tickvals))
@@ -735,7 +748,7 @@ gg2list <- function(p, width = NULL, height = NULL,
         # TODO: log type?
         type = if (isDateType) "date" else if (isDiscreteType) "category" else "linear",
         autorange = isDynamic,
-        range = rng[[paste0(xy, ".range")]] %||% rng[[paste0(xy, "_range")]],
+        range = rng[[xy]]$dimension %()% rng[[paste0(xy, ".range")]] %||% rng[[paste0(xy, "_range")]],
         tickmode = if (isDynamic) "auto" else "array",
         ticktext = ticktext,
         tickvals = tickvals,
@@ -958,7 +971,10 @@ gg2list <- function(p, width = NULL, height = NULL,
   gglayout$legend <- list(
     bgcolor = toRGB(theme$legend.background$fill),
     bordercolor = toRGB(theme$legend.background$colour),
-    borderwidth = unitConvert(theme$legend.background$size, "pixels", "width"),
+    borderwidth = unitConvert(
+      theme$legend.background[[linewidth_or_size(theme$legend.background)]], 
+      "pixels", "width"
+    ),
     font = text2font(theme$legend.text)
   )
 
@@ -1191,7 +1207,7 @@ verifyUnit <- function(u) {
 
   ## the default unit in ggplot2 is millimeters (unless it's element_text())
   if (inherits(u, "element")) {
-    grid::unit(u$size %||% 0, "points")
+    grid::unit(u[[linewidth_or_size(u)]] %||% 0, "points")
   } else {
     grid::unit(u %||% 0, "mm")
   }
@@ -1411,7 +1427,8 @@ gdef2trace <- function(gdef, theme, gglayout) {
           bgcolor = toRGB(theme$legend.background$fill),
           bordercolor = toRGB(theme$legend.background$colour),
           borderwidth = unitConvert(
-            theme$legend.background$size, "pixels", "width"
+            theme$legend.background[[linewidth_or_size(theme$legend.background)]],
+            "pixels", "width"
           ),
           thickness = unitConvert(
             theme$legend.key.width, "pixels", "width"

R/group2NA.R

@@ -23,7 +23,7 @@
 #' then `groupNames`, then `ordered`. As long as `groupNames` 
 #' contains valid variable names, new rows will also be inserted to separate 
 #' the groups.
-#' @examples 
+#' @examplesIf interactive() || !identical(.Platform$OS.type, "windows")
 #' 
 #' # note the insertion of new rows with missing values 
 #' group2NA(mtcars, "vs", "cyl")