Merge branch 'master' into fix_wrap_axes

Author: cpsievert

DESCRIPTION

@@ -18,7 +18,7 @@ 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-book.cpsievert.me, https://github.com/ropensci/plotly#readme, https://plot.ly/r
+URL: https://plotly-r.com, https://github.com/ropensci/plotly#readme, https://plot.ly/r
 BugReports: https://github.com/ropensci/plotly/issues
 Depends:
     R (>= 3.2.0),
@@ -54,7 +54,7 @@ Suggests:
     knitr,
     devtools,
     shiny (>= 1.1.0),
-    shinytest (> 1.3.0),
+    shinytest (>= 1.3.0),
     curl,
     rmarkdown,
     vdiffr,

NEWS.md

@@ -73,7 +73,7 @@
 ### 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).
-* 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-book.cpsievert.me/linking-views-without-shiny.html#transient-versus-persistent-selection) in the browser, rather than at the command line.
+* 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.
 * The `config()` function gains a `locale` argument for easily changing localization defaults (#1270). This makes it possible localize date axes, and in some cases, modebar buttons (#1270).
@@ -181,7 +181,7 @@
 * `ggplotly()` gains a new argument, `dynamicTicks`, which allows axis ticks to update upon zoom/pan interactions (fixes #485).
 * Sensible sizing and positioning defaults are now provided for subplots multiple colorbars.
 * R linebreaks are translated to HTML linebreaks (i.e., '\n' translates to '<br />') (fixes #851).
-* Added a `plot_dendro()` function for a quick and dirty interactive dendrogram with support for hierarchial selection. For more, see -- <https://cpsievert.github.io/plotly_book/linking-views-without-shiny.html#nested-selections>
+* Added a `plot_dendro()` function for a quick and dirty interactive dendrogram with support for hierarchial selection. For more, see -- <https://plotly-r.com/client-side-linking.html#fig:dendro>
 * The `export()` function gains a `selenium` argument for rendering/exporting WebGL plots and exporting to 'svg'/'webp' file formats (via the plotly.js function [Plotly.downloadImage()](https://plot.ly/javascript/plotlyjs-function-reference/#plotlydownloadimage)).
 * Better type checking of trace attributes will now automatically reduce a single-valued vector to a constant (when appropriate). This is particularly useful for anchoring multiple traces to a single legend entry via `legendgroup` (see #675, #817, #826).
 * The `plotlyOutput()` function gains a `inline` argument which makes it easier to place multiple plots in the same row (in a shiny application).

R/add.R

@@ -33,7 +33,7 @@ add_data <- function(p, data = NULL) {
 #' @param xend "final" x position (in this context, x represents "start")
 #' @param yend "final" y position (in this context, y represents "start")
 #' @seealso [plot_ly()]
-#' @references \url{http://plotly-book.cpsievert.me/the-plotly-cookbook.html}
+#' @references \url{https://plotly-r.com/overview.html}
 #' 
 #' \url{https://plot.ly/r}
 #' 

R/ggplotly.R

@@ -238,10 +238,10 @@ gg2list <- function(p, width = NULL, height = NULL,
 
   # ggplot2 3.1.0.9000 introduced a Layer method named setup_layer() 
   # currently, LayerSf is the only core-ggplot2 Layer that makes use
-  # of it https://github.com/tidyverse/ggplot2/pull/2875
+  # of it https://github.com/tidyverse/ggplot2/pull/2875#issuecomment-438708426
   data <- layer_data
   if (packageVersion("ggplot2") > "3.1.0") {
-    data <- by_layer(function(l, d) l$setup_layer(d, plot))
+    data <- by_layer(function(l, d) if (is.function(l$setup_layer)) l$setup_layer(d, plot) else d)
   }
 
   # Initialise panels, add extra data for margins & missing facetting

R/highlight.R

@@ -50,14 +50,13 @@
 #' @param ... currently not supported.
 #' @export
 #' @author Carson Sievert
-#' @references \url{https://cpsievert.github.io/plotly_book/linking-views-without-shiny.html}
+#' @references \url{https://plotly-r.com/client-side-linking.html}
 #' @seealso [attrs_selected()]
 #' @examples
 #' 
 #' # These examples are designed to show you how to highlight/brush a *single*
 #' # view. For examples of multiple linked views, see `demo(package = "plotly")` 
 #' 
-#' library(crosstalk)
 #' d <- highlight_key(txhousing, ~city)
 #' p <- ggplot(d, aes(date, median, group = city)) + geom_line()
 #' gg <- ggplotly(p, tooltip = "city") 

R/plotly.R

@@ -77,7 +77,7 @@
 #' with the source argument in [event_data()] to retrieve the 
 #' event data corresponding to a specific plot (shiny apps can have multiple plots).
 #' @author Carson Sievert
-#' @references <https://plotly-book.cpsievert.me/the-plotly-cookbook.html>
+#' @references <https://plotly-r.com/overview.html>
 #' @seealso \itemize{
 #'  \item For initializing a plotly-geo object: [plot_geo()]
 #'  \item For initializing a plotly-mapbox object: [plot_mapbox()]

R/shiny.R

@@ -93,7 +93,7 @@ register_plot_events <- function(p) {
 #' @export
 #' @seealso [event_register], [event_unregister]
 #' @references 
-#'   * <https://plotly-book.cpsievert.me/shiny-plotly-inputs.html> 
+#'   * <https://plotly-r.com/linking-views-with-shiny.html#shiny-plotly-inputs> 
 #'   * <https://plot.ly/javascript/plotlyjs-function-reference/>
 #' @author Carson Sievert
 #' @examples \dontrun{

inst/CITATION

@@ -5,7 +5,7 @@ bibentry(
   title = "plotly for R",
   author = personList(as.person("Carson Sievert")),
   year = "2018",
-  url = "https://plotly-book.cpsievert.me",
+  url = "https://plotly-r.com",
 
-  textVersion = "Carson Sievert (2018) plotly for R. https://plotly-book.cpsievert.me"
+  textVersion = "Carson Sievert (2018) plotly for R. https://plotly-r.com"
 )