Merge pull request #2 from ropensci/master

Update to 4.9.2.9000

Author: rpkyle

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: plotly
 Title: Create Interactive Web Graphics via 'plotly.js'
-Version: 4.9.1.9000
+Version: 4.9.2.9000
 Authors@R: c(person("Carson", "Sievert", role = c("aut", "cre"),
     email = "[email protected]", comment = c(ORCID = "0000-0002-4958-2844")),
     person("Chris", "Parmer", role = "aut",
@@ -72,6 +72,6 @@ Suggests:
     plotlyGeoAssets,
     forcats
 LazyData: true
-RoxygenNote: 7.0.2
+RoxygenNote: 7.1.0
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)

NEWS.md

@@ -1,4 +1,22 @@
-# 4.9.1.9000
+# 4.9.2.9000
+
+## IMPROVEMENTS
+
+## BUG FIXES
+
+# 4.9.2.1
+
+This is minor patch release with a few minor bug fixes and updates test expectations in anticipation of new R 4.0 defaults.
+
+## BUG FIXES
+
+* Fixes rendering issues non-HTML **rmarkdown** output formats, which was introduced in the 4.9.2 release (#1702).
+* Fixes a `ggplotly()` bug in axis tick translation (#1725, #1721).
+* `plot_mapbox()` now correctly defaults to a scattermapbox trace (unless z is present, then it defaults to choroplethmapbox) (#1707).
+* `ggplotly()` now correctly resolves overlapping axis tick text in `coord_sf()` (#1673).
+* A false-positive warning is no longer thrown when attempting to cast `toWebGL()` (#1569).
+
+# 4.9.2
 
 ## Changes to plotly.js
 
@@ -11,6 +29,7 @@
 ## BUG FIXES
 
 * `add_sf()`/`geom_sf()` now correctly handle geometry columns that are named something other than `"geometry"` (#1659).
+* Specifying an english locale no longer results in error (#1686).
 
 # 4.9.1
 

R/ggplotly.R

@@ -612,7 +612,13 @@ gg2list <- function(p, width = NULL, height = NULL,
       if ("CoordSf" %in% class(p$coordinates)) {
         # see CoordSf$render_axis_v
         direction <- if (xy == "x") "E" else "N"
-        idx <- rng$graticule$type == direction & !is.na(rng$graticule$degree_label)
+        idx <- rng$graticule$type == direction & 
+          !is.na(rng$graticule$degree_label) &
+          # Respect the logical 'plot12' column which sf constructs for 
+          # determining which tick labels should be drawn
+          # https://github.com/r-spatial/sf/blob/b49d37/R/graticule.R#L199
+          # https://github.com/r-spatial/sf/blob/52a8351/R/plot.R#L580
+          (rng$graticule$plot12 %||% TRUE)
         tickData <- rng$graticule[idx, ]
         # TODO: how to convert a language object to unicode character string?
         rng[[paste0(xy, ".labels")]] <- sub(
@@ -687,8 +693,9 @@ gg2list <- function(p, width = NULL, height = NULL,
       tickvals <- rng[[xy]]$break_positions %()% rng[[paste0(xy, ".major")]]
 
       # https://github.com/tidyverse/ggplot2/pull/3566#issuecomment-565085809
-      ticktext <- ticktext[!is.na(ticktext)]
-      tickvals <- tickvals[!is.na(tickvals)]
+      hasTickText <- !(is.na(ticktext) | is.na(tickvals))
+      ticktext <- ticktext[hasTickText]
+      tickvals <- tickvals[hasTickText]
 
       axisObj <- list(
         # TODO: log type?

R/plotly.R

@@ -430,7 +430,7 @@ as_widget <- function(x, ...) {
       # we shouldn't need it because Object.setPrototypeOf() is pretty widely supported
       # https://github.com/plotly/plotly.js/issues/4556#issuecomment-583061419
       # https://caniuse.com/#search=setPrototypeOf
-      if (isTRUE(getOption("shiny.testmode"))) {
+      if (needsPrototypePolyfill()) {
         list(setPrototypeOfPolyfill())
       },
       list(typedArrayPolyfill()),
@@ -441,6 +441,18 @@ as_widget <- function(x, ...) {
   )
 }
 
+needsPrototypePolyfill <- function() {
+  if (isTRUE(getOption("shiny.testmode"))) {
+    return(TRUE)
+  }
+  
+  if (isTRUE(getOption("knitr.in.progress"))) {
+    return(!knitr::is_html_output())
+  }
+  
+  return(FALSE)
+}
+
 setPrototypeOfPolyfill <- function() {
   htmltools::htmlDependency(
     name = "setprototypeof", 

R/plotly_build.R

@@ -109,10 +109,13 @@ plotly_build.plotly <- function(p, registerFrames = TRUE) {
   if (is_mapbox(p) || is_geo(p)) {
     p <- geo2cartesian(p)
     attrsToEval <- lapply(attrsToEval, function(tr) {
-      if (!grepl("scatter|choropleth", tr[["type"]] %||% "scatter")) {
-        stop("Cant add a '", tr[["type"]], "' trace to a map object", call. = FALSE)
+      type <- tr[["type"]] %||% "scatter"
+      if (!grepl("scatter|choropleth", type)) {
+        warning("Can't add a '", type, "' trace to a map object", call. = FALSE)
+      }
+      if (is_mapbox(p)) {
+        tr[["type"]] <- if (!is.null(tr[["z"]])) "choroplethmapbox" else "scattermapbox"
       }
-      if (is_mapbox(p)) tr[["type"]] <- tr[["type"]] %||% "scattermapbox"
       if (is_geo(p)) {
         tr[["type"]] <- if (!is.null(tr[["z"]])) "choropleth" else "scattergeo"
       }

R/utils.R

@@ -823,14 +823,15 @@ verify_webgl <- function(p) {
     return(p)
   }
   types <- sapply(p$x$data, function(x) x[["type"]][1] %||% "scatter")
-  idx <- paste0(types, "gl") %in% names(Schema$traces)
-  if (any(!idx)) {
+  can_gl <- paste0(types, "gl") %in% names(Schema$traces)
+  already_gl <- grepl("gl$", types)
+  if (any(!can_gl & !already_gl)) {
     warning(
       "The following traces don't have a WebGL equivalent: ",
-      paste(which(!idx), collapse = ", ")
+      paste(which(!can_gl & !already_gl), collapse = ", ")
     )
   }
-  for (i in which(idx)) {
+  for (i in which(can_gl)) {
     p$x$data[[i]]$type <- paste0(p$x$data[[i]]$type, "gl")
   }
   p

inst/CITATION

@@ -1,11 +1,11 @@
 citHeader("To cite plotly in publications use:")
 
-bibentry(
-  bibtype = "Manual",
-  title = "plotly for R",
-  author = personList(as.person("Carson Sievert")),
-  year = "2018",
+citEntry(entry = "book",
+  author = "Carson Sievert",
+  title = "Interactive Web-Based Data Visualization with R, plotly, and shiny",
+  publisher = "Chapman and Hall/CRC",
+  year = "2020",
+  isbn = "9781138331457",
   url = "https://plotly-r.com",
-  
-  textVersion = "Carson Sievert (2018) plotly for R. https://plotly-r.com"
+  textVersion = "C. Sievert. Interactive Web-Based Data Visualization with R, plotly, and shiny. Chapman and Hall/CRC Florida, 2020."
 )

inst/docker/Dockerfile.vtest

@@ -95,6 +95,7 @@ RUN R -e "install.packages('testthat')"
 ARG CRANCACHE=1
 RUN R -e "update.packages(ask=FALSE)"
 RUN R -e "remotes::install_github('r-lib/vdiffr')"
+RUN R -e "install.packages('rnaturalearth')"
 
 # install any new dependencies, then either manage cases (the default) or run tests
 # note the workaround to get docker to run a proper exit status when there are testthat errors

inst/examples/shiny/event_data/tests/mytest-expected/001.json

@@ -422,21 +422,19 @@
           "stylesheet": null,
           "head": null,
           "attachment": null,
-          "package": null,
           "all_files": true
         },
         {
           "name": "crosstalk",
-          "version": "1.0.0",
+          "version": "1.1.0.1",
           "src": {
-            "href": "crosstalk-1.0.0"
+            "href": "crosstalk-1.1.0.1"
           },
           "meta": null,
           "script": "js/crosstalk.min.js",
           "stylesheet": "css/crosstalk.css",
           "head": null,
           "attachment": null,
-          "package": null,
           "all_files": true
         },
         {

inst/examples/shiny/event_data/tests/mytest-expected/002.json

@@ -439,21 +439,19 @@
           "stylesheet": null,
           "head": null,
           "attachment": null,
-          "package": null,
           "all_files": true
         },
         {
           "name": "crosstalk",
-          "version": "1.0.0",
+          "version": "1.1.0.1",
           "src": {
-            "href": "crosstalk-1.0.0"
+            "href": "crosstalk-1.1.0.1"
           },
           "meta": null,
           "script": "js/crosstalk.min.js",
           "stylesheet": "css/crosstalk.css",
           "head": null,
           "attachment": null,
-          "package": null,
           "all_files": true
         },
         {

inst/examples/shiny/event_data/tests/mytest-expected/003.json

@@ -443,21 +443,19 @@
           "stylesheet": null,
           "head": null,
           "attachment": null,
-          "package": null,
           "all_files": true
         },
         {
           "name": "crosstalk",
-          "version": "1.0.0",
+          "version": "1.1.0.1",
           "src": {
-            "href": "crosstalk-1.0.0"
+            "href": "crosstalk-1.1.0.1"
           },
           "meta": null,
           "script": "js/crosstalk.min.js",
           "stylesheet": "css/crosstalk.css",
           "head": null,
           "attachment": null,
-          "package": null,
           "all_files": true
         },
         {

inst/examples/shiny/event_data/tests/mytest-expected/004.json

@@ -444,21 +444,19 @@
           "stylesheet": null,
           "head": null,
           "attachment": null,
-          "package": null,
           "all_files": true
         },
         {
           "name": "crosstalk",
-          "version": "1.0.0",
+          "version": "1.1.0.1",
           "src": {
-            "href": "crosstalk-1.0.0"
+            "href": "crosstalk-1.1.0.1"
           },
           "meta": null,
           "script": "js/crosstalk.min.js",
           "stylesheet": "css/crosstalk.css",
           "head": null,
           "attachment": null,
-          "package": null,
           "all_files": true
         },
         {