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

Author: fproske

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

@@ -35,7 +35,6 @@ jobs:
           - {os: ubuntu-18.04,   r: 'oldrel',  rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
           - {os: ubuntu-18.04,   r: '3.6',     rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
           - {os: ubuntu-18.04,   r: '3.5',     rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
-          - {os: ubuntu-18.04,   r: '3.4',     rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
 
     env:
       RSPM: ${{ matrix.config.rspm }}
@@ -72,47 +71,45 @@ jobs:
           key: ${{ matrix.config.os }}-${{ steps.install-r.outputs.installed-r-version }}-1-${{ hashFiles('.github/r-depends.rds') }}
           restore-keys: ${{ matrix.config.os }}-${{ steps.install-r.outputs.installed-r-version }}-1-
 
-      - name: Install system dependencies
+      - name: Install Linux sysdeps
         if: runner.os == 'Linux'
         run: |
           pak::local_system_requirements(execute = TRUE)
           pak::pkg_system_requirements("rcmdcheck", execute = TRUE)
         shell: Rscript {0}
-      
-      - uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.config.node }}
-      
-      - name: Install orca
-        if: matrix.config.visual_tests == true
-        run: npm install -g electron@6.1.4 orca
-        shell: bash
-          
-      - name: Install phantomjs
-        if: matrix.config.shinytest == true
-        run: |
-          pak::pak("shinytest")
-          shinytest::installDependencies()
-          pak::pak()
-        shell: Rscript {0}
-
+        
       - name: Install dependencies
         run: |
-          pak::local_install_dev_deps(upgrade = TRUE)
+          if (Sys.info()[['sysname']] == 'Darwin') options(pkgType = 'mac.binary')
+          pak::local_install_dev_deps(upgrade = FALSE)
           pak::pkg_install("rcmdcheck")
         shell: Rscript {0}
-
-      - name: Session info
+        
+      - name: Set up Python 3.8
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+      
+      - name: Install kaleido
+        if: matrix.config.visual_tests == true
         run: |
-          options(width = 100)
-          pkgs <- installed.packages()[, "Package"]
-          sessioninfo::session_info(pkgs, include_base = TRUE)
-        shell: Rscript {0}
+          sudo chown -R $UID $CONDA # https://github.com/nextstrain/conda/issues/5
+          Rscript -e "reticulate::install_miniconda()"
+          Rscript -e "reticulate::conda_install('r-reticulate', 'python-kaleido')"
+          Rscript -e "reticulate::conda_install('r-reticulate', 'plotly', channel = 'plotly')"
+          Rscript -e "reticulate::use_miniconda('r-reticulate')"
+        
+      - name: Install shinytest deps
+        if: matrix.config.shinytest == true
+        run: |
+          Rscript -e 'shinytest::installDependencies()'
+          R CMD install .
+        shell: bash
 
         # Run test() before R CMD check since, for some reason, rcmdcheck::rcmdcheck() skips vdiffr tests
       - name: Run Tests
         run: |
-          options(crayon.enabled = TRUE)
+          options(crayon.enabled = TRUE, testthat.progress.max_fails=1000)
           if (!require(devtools)) pak::pak("devtools")
           if (!require(reshape2)) pak::pak("reshape2")
           res <- devtools::test()

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: plotly
 Title: Create Interactive Web Graphics via 'plotly.js' (modified for use in MIRO)
-Version: 4.9.4.9000
+Version: 4.10.0.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",
@@ -22,8 +22,8 @@ Authors@R: c(person("Carson", "Sievert", role = c("aut", "cre"),
     person("Plotly Technologies Inc.", role = "cph"))
 License: MIT + file LICENSE
 Description: Create interactive web graphics from 'ggplot2' graphs and/or a custom interface to the (MIT-licensed) JavaScript library 'plotly.js' inspired by the grammar of graphics.
-URL: https://plotly-r.com, https://github.com/ropensci/plotly#readme, https://plotly.com/r/
-BugReports: https://github.com/ropensci/plotly/issues
+URL: https://plotly-r.com, https://github.com/plotly/plotly.R, https://plotly.com/r/
+BugReports: https://github.com/plotly/plotly.R/issues
 Depends:
     R (>= 3.2.0)
 Imports:
@@ -54,6 +54,7 @@ Suggests:
     hexbin,
     ggthemes,
     GGally,
+    ggalluvial,
     testthat,
     knitr,
     devtools,
@@ -66,17 +67,18 @@ Suggests:
     webshot,
     listviewer,
     dendextend,
-    sf,
     maptools,
     rgeos,
+    sf,
     png,
     IRdisplay,
     processx,
     plotlyGeoAssets,
     forcats,
     palmerpenguins,
-    rversions
+    rversions,
+    reticulate
 LazyData: true
-RoxygenNote: 7.1.1
+RoxygenNote: 7.1.2
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)

NAMESPACE

@@ -33,6 +33,7 @@ S3method(print,api)
 S3method(print,api_grid)
 S3method(print,api_grid_local)
 S3method(print,api_plot)
+S3method(print,kaleidoScope)
 S3method(print,plotly_data)
 S3method(to_basic,GeomAbline)
 S3method(to_basic,GeomAnnotationMap)
@@ -134,6 +135,7 @@ export(hide_guides)
 export(hide_legend)
 export(highlight)
 export(highlight_key)
+export(kaleido)
 export(knit_print.api_grid)
 export(knit_print.api_grid_local)
 export(knit_print.api_plot)
@@ -166,6 +168,7 @@ export(remove_typedarray_polyfill)
 export(rename)
 export(rename_)
 export(renderPlotly)
+export(save_image)
 export(schema)
 export(select)
 export(select_)
@@ -257,6 +260,7 @@ importFrom(tidyr,unnest)
 importFrom(tools,file_ext)
 importFrom(tools,file_path_sans_ext)
 importFrom(utils,browseURL)
+importFrom(utils,capture.output)
 importFrom(utils,data)
 importFrom(utils,file.edit)
 importFrom(utils,getFromNamespace)

NEWS.md

@@ -1,12 +1,39 @@
-# 4.9.4.9000
+# 4.10.0.9000
 
-## Changes to plotly.js
+## New features
+
+* `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)
+
+## 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)
+
+## Improvements
+
+* `ggplotly()` does not issue warnings with `options(warnPartialMatchArgs = TRUE)` any longer. (#2046, thanks @bersbersbers)
 
-* This version of the R package upgrades the version of the underlying plotly.js library from v1.57.1 to v2.0.0. This includes many breaking changes, bug fixes, and improvements to the underlying JavaScript library. The [plotly.js release page](https://github.com/plotly/plotly.js/releases) has the full list of changes.
+# 4.10.0
 
-## Breaking changes
+## Breaking changes in JavaScript API
+
+* This version of the R package upgrades the version of the underlying plotly.js library from v1.57.1 to v2.5.1. This includes many breaking changes, bug fixes, and improvements to the underlying JavaScript library. Most of the breaking changes are summarized in [this announcement of the 2.0 release](https://community.plotly.com/t/announcing-plotly-js-2-0/53675), but [see here](https://github.com/plotly/plotly.js/blob/HEAD/CHANGELOG.md) for the full changelog.
+
+## Breaking changes in R API
 
 * `ggplotly()` now uses the `layout.legend.title` (instead of `layout.annotations`) plotly.js API to convert guides for discrete scales. (#1961)
+* `renderPlotly()` now uses `Plotly.react()` (instead of `Plotly.newPlot()`) to redraw when `layout(transition = )` is specified. This makes it possible/easier to implement a smooth transitions when `renderPlotly()` gets re-executed. (#2001)
+
+## New Features
+
+* Added new functions for static image exporting via the [kaleido python package](https://github.com/plotly/Kaleido), namely `save_image()` and `kaleido()`. See `help(save_image, package = "plotly")` for installation info and example usage. (#1971)
+
+## Improvements
+
+* `ggplotly()` now better positions axis titles for `facet_wrap()`/`facet_grid()`. (#1975)
 
 # 4.9.4.1
 
@@ -39,7 +66,7 @@
 
 * All HTTP requests are now retried upon failure (#1656, @jameslamb).
 
-* R linebreaks (`\n`) in _factor labels_ are now translated to HTML linebreaks (`<br />`), too. Before, this conversion was only done for colums of type character. ([#1700](https://github.com/ropensci/plotly/pull/1700), @salim-b).
+* R linebreaks (`\n`) in _factor labels_ are now translated to HTML linebreaks (`<br />`), too. Before, this conversion was only done for colums of type character. ([#1700](https://github.com/plotly/plotly.R/pull/1700), @salim-b).
 
 ## BUG FIXES
 
@@ -173,7 +200,7 @@ This is minor patch release with a few minor bug fixes and updates test expectat
 
 ### Other improvements relevant for all **plotly** objects
 
-* LaTeX rendering via MathJax is now supported and the new `TeX()` function may be used to flag a character vector as LaTeX (#375). Use the new `mathjax` argument in `config()` to specify either external (`mathjax="cdn"`) or local (`mathjax="local"`) MathJaX. If `"cdn"`, mathjax is loaded externally (meaning an internet connection is needed for TeX rendering). If `"local"`, the PLOTLY_MATHJAX_PATH environment variable must be set to the location (a local file path) of MathJax. IMPORTANT: **plotly** uses SVG-based mathjax rendering which doesn't play nicely with HTML-based rendering (e.g., **rmarkdown** documents and **shiny** apps). To leverage both types of rendering, you must `<iframe>` your plotly graph(s) into the larger document (see [here](https://github.com/ropensci/plotly/blob/master/inst/examples/rmd/MathJax/index.Rmd) for an **rmarkdown** example  and [here](https://github.com/ropensci/plotly/blob/master/inst/examples/rmd/MathJax/index.Rmd) for a **shiny** example).
+* LaTeX rendering via MathJax is now supported and the new `TeX()` function may be used to flag a character vector as LaTeX (#375). Use the new `mathjax` argument in `config()` to specify either external (`mathjax="cdn"`) or local (`mathjax="local"`) MathJaX. If `"cdn"`, mathjax is loaded externally (meaning an internet connection is needed for TeX rendering). If `"local"`, the PLOTLY_MATHJAX_PATH environment variable must be set to the location (a local file path) of MathJax. IMPORTANT: **plotly** uses SVG-based mathjax rendering which doesn't play nicely with HTML-based rendering (e.g., **rmarkdown** documents and **shiny** apps). To leverage both types of rendering, you must `<iframe>` your plotly graph(s) into the larger document (see [here](https://github.com/plotly/plotly.R/blob/master/inst/examples/rmd/MathJax/index.Rmd) for an **rmarkdown** example  and [here](https://github.com/plotly/plotly.R/blob/master/inst/examples/rmd/MathJax/index.Rmd) for a **shiny** example).
 * The selection (i.e., linked-brushing) mode can now switch from 'transient' to 'persistent' by holding the 'shift' key. It's still possible to _force_ persistent selection by setting `persistent = TRUE` in `highlight()`, but `persistent = FALSE` (the default) is now recommended since it allows one to switch between [persistent/transient selection](https://plotly-r.com/client-side-linking.html#fig:txmissing-modes) in the browser, rather than at the command line.
 * The `highlight()` function gains a `debounce` argument for throttling the rate at which `on` events may be fired. This is mainly useful for improving user experience when `highlight(on = "plotly_hover")` and mousing over relevant markers at a rapid rate (#1277)
 * The new `partial_bundle()` function makes it easy to leverage [partial bundles of plotly.js](https://github.com/plotly/plotly.js#partial-bundles) for reduced file sizes and faster render times.
@@ -444,7 +471,7 @@ limits.
 
 ## BUG FIXES
 
-* `event_data()` now works inside shiny modules (#659). For an example, see <https://github.com/ropensci/plotly/tree/master/inst/examples/shiny/event_data_modules>
+* `event_data()` now works inside shiny modules (#659). For an example, see <https://github.com/plotly/plotly.R/tree/master/inst/examples/shiny/event_data_modules>
 
 # 4.3.6 -- 9 September 2016
 

R/add.R

@@ -130,9 +130,14 @@ add_data <- function(p, data = NULL) {
 #'   layout(title = "Basic Pie Chart using Plotly")
 #'   
 #' data(wind)
-#' plot_ly(wind, r = ~r, t = ~t) %>% 
+#' plot_ly(wind, r = ~r, theta = ~t) %>% 
 #'   add_area(color = ~nms) %>%
-#'   layout(radialaxis = list(ticksuffix = "%"), orientation = 270)
+#'   layout(
+#'     polar = list(
+#'       radialaxis = list(ticksuffix = "%"), 
+#'       angularaxis = list(rotation = 90)
+#'     )
+#'   )
 #' 
 #' # ------------------------------------------------------------
 #' # 3D chart types
@@ -432,20 +437,29 @@ add_image <- function(p, z = NULL, colormodel = NULL, ..., data = NULL, inherit
 
 #' @inheritParams add_trace
 #' @rdname add_trace
-#' @param r For polar chart only. Sets the radial coordinates.
-#' @param t For polar chart only. Sets the radial coordinates.
+#' @param r Sets the radial coordinates.
+#' @param theta Sets the angular coordinates.
+#' @param t Deprecated. Use `theta` instead.
 #' @export
-add_area <- function(p, r = NULL, t = NULL, ...,
+add_area <- function(p, r = NULL, theta = NULL, t = NULL, ...,
                      data = NULL, inherit = TRUE) {
+  if (!is.null(t)) {
+    message(
+      "Since `add_area()` now uses the barpolar instead of the area trace, ", 
+      "the `t` argument is now deprecated. Use the `theta` argument instead."
+    )
+  }
+  theta <- theta %||% t
   if (inherit) {
-    r <- t %||% p$x$attrs[[1]][["r"]]
-    t <- t %||% p$x$attrs[[1]][["t"]]
+    attrs <- p$x$attrs[[1]]
+    r <- r %||% attrs[["r"]]
+    theta <- theta %||% (attrs[["theta"]] %||% attrs[["t"]])
   }
-  if (is.null(r) || is.null(t)) {
-    stop("Must supply `r`/`t` attributes", call. = FALSE)
+  if (is.null(r) || is.null(theta)) {
+    stop("Must supply `r`/`theta` attributes", call. = FALSE)
   }
   add_trace_classed(
-    p, class = "plotly_area", r = r, t = t, type = "area",
+    p, class = "plotly_area", r = r, theta = theta, type = "barpolar",
     ..., data = data, inherit = inherit
   )
 }

R/deprecated.R

@@ -51,7 +51,7 @@ get_figure <- function(username, id) {
 #' For more details and examples, see \url{https://plotly.com/r/getting-started/}.
 #' 
 #' If you're here looking for an intro/overview of the package, see the 
-#' \href{https://github.com/ropensci/plotly/#getting-started}{readme}
+#' \href{https://github.com/plotly/plotly.R/#getting-started}{readme}
 #' 
 #' @keywords internal
 #' @param username plotly username